mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-19 06:09:01 +00:00
Report actual image size being tested
# Conflicts: # test_conformance/images/clFillImage/test_fill_2D_array.cpp
This commit is contained in:
@@ -149,29 +149,28 @@ int test_fill_image_set_2D_array( cl_device_id device, cl_context context, cl_co
|
||||
}
|
||||
|
||||
imageInfo.slicePitch = imageInfo.rowPitch * (imageInfo.height + slicePadding);
|
||||
cl_ulong size = (cl_ulong)imageInfo.slicePitch * (cl_ulong)imageInfo.arraySize * 4 * 4;
|
||||
|
||||
// Loop until we get a size that a) will fit in the max alloc size and b) that an allocation of that
|
||||
// image, the result array, plus offset arrays, will fit in the global ram space
|
||||
while( size > maxAllocSize || ( size * 3 ) > memSize )
|
||||
{
|
||||
if(imageInfo.arraySize == 1)
|
||||
{
|
||||
// ArraySize cannot be 0.
|
||||
cl_ulong size = (cl_ulong)imageInfo.slicePitch * (cl_ulong)imageInfo.arraySize * 4 * 4;
|
||||
|
||||
while (size > maxAllocSize || (size * 3) > memSize) {
|
||||
if (imageInfo.arraySize == 1) {
|
||||
// arraySize cannot be 0.
|
||||
break;
|
||||
}
|
||||
imageInfo.arraySize--;
|
||||
size = (cl_ulong)imageInfo.slicePitch * (cl_ulong)imageInfo.arraySize * 4 * 4;
|
||||
}
|
||||
|
||||
while( size > maxAllocSize || ( size * 3 ) > memSize )
|
||||
{
|
||||
while (size > maxAllocSize || (size * 3) > memSize) {
|
||||
imageInfo.height--;
|
||||
imageInfo.slicePitch = imageInfo.height * imageInfo.rowPitch;
|
||||
size = (cl_ulong)imageInfo.slicePitch * (cl_ulong)imageInfo.arraySize * 4 * 4;
|
||||
}
|
||||
log_info( "Testing %d x %d x %d\n", (int)sizes[ idx ][ 0 ], (int)sizes[ idx ][ 1 ], (int)sizes[ idx ][ 2 ] );
|
||||
if ( gDebugTrace )
|
||||
log_info( " at max size %d,%d,%d\n", (int)sizes[ idx ][ 0 ], (int)sizes[ idx ][ 1 ], (int)sizes[ idx ][ 2 ] );
|
||||
|
||||
log_info( "Testing %d x %d x %d\n", (int)imageInfo.width, (int)imageInfo.height, (int)imageInfo.arraySize);
|
||||
|
||||
if ( test_fill_image_2D_array( context, queue, &imageInfo, outputType, seed ) )
|
||||
return -1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user