diff options
| author | Homer Hsing <homer.xing@intel.com> | 2013-06-19 14:49:51 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@linux.intel.com> | 2013-06-19 15:50:53 +0800 |
| commit | 89c8e77f9245c4acab6c18390b0fef07b1ba78f2 (patch) | |
| tree | 26d913ad626d5ecb11358f89a0b5e3aa1fc42bea /utests/compiler_copy_image_3d.cpp | |
| parent | 2cacc799f7ef1dff006c97360298e4f6e847d1e9 (diff) | |
| download | beignet-89c8e77f9245c4acab6c18390b0fef07b1ba78f2.tar.gz | |
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 <homer.xing@intel.com>
Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'utests/compiler_copy_image_3d.cpp')
| -rw-r--r-- | utests/compiler_copy_image_3d.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/utests/compiler_copy_image_3d.cpp b/utests/compiler_copy_image_3d.cpp index 9816fe4a..5290090b 100644 --- a/utests/compiler_copy_image_3d.cpp +++ b/utests/compiler_copy_image_3d.cpp @@ -6,7 +6,6 @@ static void compiler_copy_image_3d(void) const size_t h = 512; const size_t depth = 1; cl_image_format format; - cl_image_desc desc; cl_sampler sampler; // Setup kernel and images @@ -19,14 +18,8 @@ static void compiler_copy_image_3d(void) format.image_channel_order = CL_RGBA; format.image_channel_data_type = CL_UNSIGNED_INT8; - desc.image_type = CL_MEM_OBJECT_IMAGE3D; - desc.image_width = w; - desc.image_height = h; - desc.image_depth = depth; - desc.image_row_pitch = 0; - desc.image_slice_pitch = 0; - OCL_CREATE_IMAGE(buf[0], CL_MEM_COPY_HOST_PTR, &format, &desc, buf_data[0]); - OCL_CREATE_IMAGE(buf[1], 0, &format, &desc, NULL); + OCL_CREATE_IMAGE3D(buf[0], CL_MEM_COPY_HOST_PTR, &format, w, h, depth, 0, 0, buf_data[0]); + OCL_CREATE_IMAGE3D(buf[1], 0, &format, w, h, depth, 0, 0, NULL); OCL_CREATE_SAMPLER(sampler, CL_ADDRESS_REPEAT, CL_FILTER_NEAREST); free(buf_data[0]); buf_data[0] = NULL; |