From 89c8e77f9245c4acab6c18390b0fef07b1ba78f2 Mon Sep 17 00:00:00 2001 From: Homer Hsing Date: Wed, 19 Jun 2013 14:49:51 +0800 Subject: update to OpenCL 1.1 header Based on our current progress, we plan to implement OpenCL 1.1 rather than OpenCL 1.2 for the next release. Thus we downgrade the header file to 1.1 in this commit. put OpenCL 1.1 header in include/CL/ add OpenCL 1.2 defs, used by some code, by "#ifndef CL_VERSION_1.2" " some OpenCL 1.2 defs" "#endif" add OCL_CREATE_IMAGE2D, OCL_CREATE_IMAGE3D, OCL_CREATE_GL_IMAGE2D, OCL_CREATE_GL_IMAGE3D update test cases Signed-off-by: Homer Hsing Reviewed-by: Zhigang Gong --- utests/compiler_fill_image0.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'utests/compiler_fill_image0.cpp') diff --git a/utests/compiler_fill_image0.cpp b/utests/compiler_fill_image0.cpp index 7c8f40e8..1ab13be6 100644 --- a/utests/compiler_fill_image0.cpp +++ b/utests/compiler_fill_image0.cpp @@ -5,19 +5,14 @@ static void compiler_fill_image0(void) const size_t w = 512; const size_t h = 512; cl_image_format format; - cl_image_desc desc; format.image_channel_order = CL_RGBA; format.image_channel_data_type = CL_UNSIGNED_INT8; - desc.image_type = CL_MEM_OBJECT_IMAGE2D; - desc.image_width = w; - desc.image_height = h; - desc.image_row_pitch = 0; // Setup kernel and images OCL_CREATE_KERNEL("test_fill_image0"); - OCL_CREATE_IMAGE(buf[0], 0, &format, &desc, NULL); + OCL_CREATE_IMAGE2D(buf[0], 0, &format, w, h, 0, NULL); // Run the kernel OCL_SET_ARG(0, sizeof(cl_mem), &buf[0]); -- cgit v1.2.1