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

CL12: Use slice pitch instead of row pitch for 1D arrays. (#315)

Browse Source 
* Use slice pitch instead of row pitch for 1D arrays.
Fixes fill_image 1Darray

* Use slice pitch instead of row pitch for 1D arrays.
Fixes copy_image 1Darray
This commit is contained in:
robquill
2019-06-18 10:28:08 +01:00
committed by Kévin Petit
parent 176f9109db
commit 6d2528f398
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,12 +195,26 @@ cl_mem create_image( cl_context context, BufferOwningPtr<char>& data, image_desc
} }
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, scanlineSize ); memcpy( dst, src, scanlineSize );
dst += mappedRow; dst += dstPitch2D;
src += scanlineSize; src += scanlineSize;
} }
@@ -478,6 +492,9 @@ int test_copy_image_generic( cl_device_id device, image_descriptor *srcImageInfo
return -1; return -1;
} }
sourcePtr += dstImageInfo->rowPitch; sourcePtr += dstImageInfo->rowPitch;
if((dstImageInfo->type == CL_MEM_OBJECT_IMAGE1D_ARRAY || dstImageInfo->type == CL_MEM_OBJECT_IMAGE1D))
destPtr += mappedSlice;
else
destPtr += mappedRow; destPtr += mappedRow;
} }
sourcePtr += dstImageInfo->slicePitch - dstImageInfo->rowPitch * dstImageInfo->height; sourcePtr += dstImageInfo->slicePitch - dstImageInfo->rowPitch * dstImageInfo->height;

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

@@ -190,12 +190,26 @@ cl_mem create_image( cl_context context, BufferOwningPtr<char>& data, image_desc
} }
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, scanlineSize ); memcpy( dst, src, scanlineSize );
dst += mappedRow; dst += dstPitch2D;
src += scanlineSize; src += scanlineSize;
} }
@@ -503,6 +517,9 @@ int test_fill_image_generic( cl_device_id device, image_descriptor *imageInfo,
return -1; return -1;
} }
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;
} }
sourcePtr += imageInfo->slicePitch - ( imageInfo->rowPitch * (imageInfo->height > 0 ? imageInfo->height : 1) ); sourcePtr += imageInfo->slicePitch - ( imageInfo->rowPitch * (imageInfo->height > 0 ? imageInfo->height : 1) );