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

Use slice pitch instead of row pitch for 1D arrays. (#313)

Browse Source 
Fixes fill_image 1Darray
This commit is contained in:
robquill
2019-06-18 10:28:46 +01:00
committed by Kévin Petit
parent 7355eec211
commit 5fdacae98b
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test_conformance/images/clFillImage/test_fill_generic.cpp
View File

@@ -194,12 +194,26 @@ cl_mem create_image( cl_context context, cl_command_queue queue, BufferOwningPtr
} }
else { else {
// Else copy one scan line at a time. // Else copy one scan line at a time.
size_t dstPitch2D = 0;
switch (imageInfo->type)
{
case CL_MEM_OBJECT_IMAGE3D:
case CL_MEM_OBJECT_IMAGE2D_ARRAY:
case CL_MEM_OBJECT_IMAGE2D:
dstPitch2D = mappedRow;
break;
case CL_MEM_OBJECT_IMAGE1D_ARRAY:
case CL_MEM_OBJECT_IMAGE1D:
dstPitch2D = mappedSlice;
break;
}
for ( size_t z = 0; z < depth; z++ ) for ( size_t z = 0; z < depth; z++ )
{ {
for ( size_t y = 0; y < height; y++ ) for ( size_t y = 0; y < height; y++ )
{ {
memcpy( dst, src, imageInfo->width * get_pixel_size(imageInfo->format) ); memcpy( dst, src, imageInfo->width * get_pixel_size(imageInfo->format) );
dst += mappedRow; dst += dstPitch2D;
src += scanlineSize; src += scanlineSize;
} }
@@ -531,6 +545,9 @@ int test_fill_image_generic( cl_context context, cl_command_queue queue, image_d
total_matched += scanlineSize; total_matched += scanlineSize;
sourcePtr += imageInfo->rowPitch; sourcePtr += imageInfo->rowPitch;
if((imageInfo->type == CL_MEM_OBJECT_IMAGE1D_ARRAY || imageInfo->type == CL_MEM_OBJECT_IMAGE1D))
destPtr += mappedSlice;
else
destPtr += mappedRow; destPtr += mappedRow;
} }