ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CopyImage verification for 1D/2D images (#1791)

Browse Source 
The verification uses a common function with nested loops to verify
the result of the copy operation. The upper loop limits thirdDim and
SecondDim should be set according to the image type under test. Previously
for 1D/2D they were set from dstImageInfo->depth and dstImageInfo->height.
The issue is that the depth and height are set to 0 when unused. This
caused the verification loop to be skipped.

Signed-off-by: John Kesapides <john.kesapides@arm.com>
This commit is contained in:
John Kesapides
2023-10-03 17:30:46 +01:00
committed by GitHub
parent 7f0c0aee05
commit 4984196bcb
1 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
test_conformance/images/clCopyImage/test_copy_generic.cpp
View File

@@ -519,32 +519,53 @@ int test_copy_image_generic( cl_context context, cl_command_queue queue, image_d
if( gDebugTrace )
log_info( " - Scanline verification...\n" );
size_t thirdDim;
size_t secondDim;
if (dstImageInfo->type == CL_MEM_OBJECT_IMAGE1D_ARRAY)
size_t thirdDim = 1;
size_t secondDim = 1;
switch (dstImageInfo->type)
{
secondDim = dstImageInfo->arraySize;
thirdDim = 1;
}
else if (dstImageInfo->type == CL_MEM_OBJECT_IMAGE2D_ARRAY)
{
secondDim = dstImageInfo->height;
if( gTestMipmaps )
secondDim = (dstImageInfo->height >> dst_lod) ? (dstImageInfo->height >> dst_lod):1;
thirdDim = dstImageInfo->arraySize;
}
else
{
secondDim = dstImageInfo->height;
thirdDim = dstImageInfo->depth;
if( gTestMipmaps )
{
secondDim = (dstImageInfo->height >> dst_lod) ? (dstImageInfo->height >> dst_lod):1;
if(dstImageInfo->type == CL_MEM_OBJECT_IMAGE3D)
thirdDim = (dstImageInfo->depth >> dst_lod) ? (dstImageInfo->depth >> dst_lod):1;
case CL_MEM_OBJECT_IMAGE1D_ARRAY: {
secondDim = dstImageInfo->arraySize;
break;
}
case CL_MEM_OBJECT_IMAGE2D_ARRAY: {
secondDim = dstImageInfo->height;
thirdDim = dstImageInfo->arraySize;
break;
}
case CL_MEM_OBJECT_IMAGE3D: {
secondDim = dstImageInfo->height;
thirdDim = dstImageInfo->depth;
break;
}
case CL_MEM_OBJECT_IMAGE2D: {
secondDim = dstImageInfo->height;
break;
}
case CL_MEM_OBJECT_IMAGE1D: {
break;
}
default: {
log_error("ERROR: Unsupported Image type. \n");
return error;
break;
}
}
if (gTestMipmaps)
{
switch (dstImageInfo->type)
{
case CL_MEM_OBJECT_IMAGE3D:
thirdDim = (dstImageInfo->depth >> dst_lod) ? (dstImageInfo->depth >> dst_lod):1;
/* Fallthrough */
case CL_MEM_OBJECT_IMAGE2D:
case CL_MEM_OBJECT_IMAGE2D_ARRAY:
secondDim = (dstImageInfo->height >> dst_lod)
? (dstImageInfo->height >> dst_lod)
: 1;
break;
}
}
for( size_t z = 0; z < thirdDim; z++ )
{
for( size_t y = 0; y < secondDim; y++ )