Make it possible run test_gl on device OpenCL 1.2 (#659)

This commit is contained in:
Grzegorz Wawiorko
2020-03-06 19:27:46 +01:00
committed by GitHub
parent d872d255f6
commit bbbc27e6df
2 changed files with 4 additions and 14 deletions

View File

@@ -253,7 +253,7 @@ int test_cl_image_read( cl_context context, cl_command_queue queue,
programPtr = kernelSource; programPtr = kernelSource;
if( create_single_kernel_helper( context, &program, &kernel, 1, if( create_single_kernel_helper( context, &program, &kernel, 1,
(const char **)&programPtr, "sample_test", "-cl-std=CL2.0" ) ) (const char **)&programPtr, "sample_test", "" ) )
{ {
return -1; return -1;
} }
@@ -278,12 +278,7 @@ int test_cl_image_read( cl_context context, cl_command_queue queue,
test_error( error, "Unable to create output buffer" ); test_error( error, "Unable to create output buffer" );
/* Assign streams and execute */ /* Assign streams and execute */
cl_sampler_properties properties[] = { clSamplerWrapper sampler = clCreateSampler( context, CL_FALSE, CL_ADDRESS_NONE, CL_FILTER_NEAREST, &error );
CL_SAMPLER_NORMALIZED_COORDS, CL_FALSE,
CL_SAMPLER_ADDRESSING_MODE, CL_ADDRESS_NONE,
CL_SAMPLER_FILTER_MODE, CL_FILTER_NEAREST,
0 };
clSamplerWrapper sampler = clCreateSamplerWithProperties( context, properties, &error );
test_error( error, "Unable to create sampler" ); test_error( error, "Unable to create sampler" );
error = clSetKernelArg( kernel, 0, sizeof( streams[ 0 ] ), &streams[ 0 ] ); error = clSetKernelArg( kernel, 0, sizeof( streams[ 0 ] ), &streams[ 0 ] );

View File

@@ -336,7 +336,7 @@ int test_cl_image_write( cl_context context, cl_command_queue queue,
programPtr = kernelSource; programPtr = kernelSource;
if( create_single_kernel_helper_with_build_options( context, &program, &kernel, 1, if( create_single_kernel_helper_with_build_options( context, &program, &kernel, 1,
(const char **)&programPtr, "sample_test", "-cl-std=CL2.0" ) ) (const char **)&programPtr, "sample_test", "" ) )
{ {
return -1; return -1;
} }
@@ -366,12 +366,7 @@ int test_cl_image_write( cl_context context, cl_command_queue queue,
channelSize * 4 * width * height * depth, *outSourceBuffer, &error ); channelSize * 4 * width * height * depth, *outSourceBuffer, &error );
test_error( error, "Unable to create output buffer" ); test_error( error, "Unable to create output buffer" );
cl_sampler_properties properties[] = { clSamplerWrapper sampler = clCreateSampler(context, CL_FALSE, CL_ADDRESS_NONE, CL_FILTER_NEAREST, &error);
CL_SAMPLER_NORMALIZED_COORDS, CL_FALSE,
CL_SAMPLER_ADDRESSING_MODE, CL_ADDRESS_NONE,
CL_SAMPLER_FILTER_MODE, CL_FILTER_NEAREST,
0 };
clSamplerWrapper sampler = clCreateSamplerWithProperties( context, properties, &error );
test_error( error, "Unable to create sampler" ); test_error( error, "Unable to create sampler" );
error = clSetKernelArg( kernel, 0, sizeof( inStream ), &inStream ); error = clSetKernelArg( kernel, 0, sizeof( inStream ), &inStream );