diff options
| author | Zhigang Gong <zhigang.gong@linux.intel.com> | 2013-04-19 16:31:09 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@linux.intel.com> | 2013-04-22 17:42:42 +0800 |
| commit | ef83bc2790d6be7e0e70a90e3b2cf0cb0dc852ca (patch) | |
| tree | b601e2c044eef5ded4b4d27802c0bf94523b1a14 | |
| parent | 9c11c18544992a456e6eab8da2949ebd134a4e44 (diff) | |
| download | beignet-ef83bc2790d6be7e0e70a90e3b2cf0cb0dc852ca.tar.gz | |
utests: should set pitch to zero if host_ptr is NULL.
Per OCL spec, we should set pitch to zero if the host_ptr is
NULL.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Simon Richter <Simon.Richter@hogyros.de>
| -rw-r--r-- | utests/compiler_copy_image.cpp | 3 | ||||
| -rw-r--r-- | utests/compiler_fill_image.cpp | 2 | ||||
| -rw-r--r-- | utests/compiler_fill_image0.cpp | 2 | ||||
| -rw-r--r-- | utests/compiler_movforphi_undef.cpp | 15 |
4 files changed, 12 insertions, 10 deletions
diff --git a/utests/compiler_copy_image.cpp b/utests/compiler_copy_image.cpp index 685a189c..04c95444 100644 --- a/utests/compiler_copy_image.cpp +++ b/utests/compiler_copy_image.cpp @@ -21,8 +21,9 @@ static void compiler_copy_image(void) desc.image_width = w; desc.image_height = h; desc.image_row_pitch = w * sizeof(uint32_t); - OCL_CREATE_IMAGE(buf[0], CL_MEM_COPY_HOST_PTR, &format, &desc, buf_data[0]); + + desc.image_row_pitch = 0; OCL_CREATE_IMAGE(buf[1], 0, &format, &desc, NULL); OCL_CREATE_SAMPLER(sampler, CL_ADDRESS_REPEAT, CL_FILTER_NEAREST); free(buf_data[0]); diff --git a/utests/compiler_fill_image.cpp b/utests/compiler_fill_image.cpp index c9744ccf..c9242b25 100644 --- a/utests/compiler_fill_image.cpp +++ b/utests/compiler_fill_image.cpp @@ -13,7 +13,7 @@ static void compiler_fill_image(void) desc.image_type = CL_MEM_OBJECT_IMAGE2D; desc.image_width = w; desc.image_height = h; - desc.image_row_pitch = w * sizeof(uint32_t); + desc.image_row_pitch = 0; // Setup kernel and images OCL_CREATE_KERNEL("test_fill_image"); diff --git a/utests/compiler_fill_image0.cpp b/utests/compiler_fill_image0.cpp index 2fef90cf..cf76be3f 100644 --- a/utests/compiler_fill_image0.cpp +++ b/utests/compiler_fill_image0.cpp @@ -12,7 +12,7 @@ static void compiler_fill_image0(void) desc.image_type = CL_MEM_OBJECT_IMAGE2D; desc.image_width = w; desc.image_height = h; - desc.image_row_pitch = w * sizeof(uint32_t); + desc.image_row_pitch = 0; // Setup kernel and images diff --git a/utests/compiler_movforphi_undef.cpp b/utests/compiler_movforphi_undef.cpp index 19e395fe..30e53bb4 100644 --- a/utests/compiler_movforphi_undef.cpp +++ b/utests/compiler_movforphi_undef.cpp @@ -8,13 +8,6 @@ static void compiler_movforphi_undef(void) 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 = w * sizeof(uint32_t); - // Setup kernel and images OCL_CREATE_KERNEL("test_movforphi_undef"); buf_data[0] = (uint32_t*) malloc(sizeof(uint32_t) * w * h); @@ -22,7 +15,15 @@ static void compiler_movforphi_undef(void) for (uint32_t i = 0; i < w; i++) ((uint32_t*)buf_data[0])[j * w + i] = j * w + i; + 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 = w * sizeof(uint32_t); OCL_CREATE_IMAGE(buf[0], CL_MEM_COPY_HOST_PTR, &format, &desc, buf_data[0]); + + desc.image_row_pitch = 0; OCL_CREATE_IMAGE(buf[1], 0, &format, &desc, NULL); OCL_CREATE_SAMPLER(sampler, CL_ADDRESS_REPEAT, CL_FILTER_NEAREST); free(buf_data[0]); |