diff --git a/lib/CL/clCommandBarrierWithWaitListKHR.c b/lib/CL/clCommandBarrierWithWaitListKHR.c
index 6036d78044699c5fb90c0397f542e47be4928f64..55be79d7491bc502a1fc44457cc176d726331745 100644
--- a/lib/CL/clCommandBarrierWithWaitListKHR.c
+++ b/lib/CL/clCommandBarrierWithWaitListKHR.c
@@ -30,6 +30,7 @@
CL_API_ENTRY cl_int
POname (clCommandBarrierWithWaitListKHR) (
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
+ const cl_command_properties_khr* properties,
cl_uint num_sync_points_in_wait_list,
const cl_sync_point_khr *sync_point_wait_list,
cl_sync_point_khr *sync_point,
diff --git a/lib/CL/clCommandCopyBufferKHR.c b/lib/CL/clCommandCopyBufferKHR.c
index 0a2e961a90e186c1a2af92af2568a7fac932fc39..95f92adb65b9527cf908c3d13160ded5b9214b65 100644
--- a/lib/CL/clCommandCopyBufferKHR.c
+++ b/lib/CL/clCommandCopyBufferKHR.c
@@ -31,6 +31,7 @@
extern CL_API_ENTRY cl_int CL_API_CALL
POname (clCommandCopyBufferKHR) (
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
+ const cl_command_properties_khr* properties,
cl_mem src_buffer, cl_mem dst_buffer, size_t src_offset, size_t dst_offset,
size_t size, cl_uint num_sync_points_in_wait_list,
const cl_sync_point_khr *sync_point_wait_list,
diff --git a/lib/CL/clCommandCopyBufferRectKHR.c b/lib/CL/clCommandCopyBufferRectKHR.c
index 952388a030101152ce188535b6f062addce6811f..dd3d60943bfdc96231177b609efb77570c568bde 100644
--- a/lib/CL/clCommandCopyBufferRectKHR.c
+++ b/lib/CL/clCommandCopyBufferRectKHR.c
@@ -29,6 +29,7 @@
CL_API_ENTRY cl_int CL_API_CALL
POname (clCommandCopyBufferRectKHR) (
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
+ const cl_command_properties_khr* properties,
cl_mem src_buffer, cl_mem dst_buffer, const size_t *src_origin,
const size_t *dst_origin, const size_t *region, size_t src_row_pitch,
size_t src_slice_pitch, size_t dst_row_pitch, size_t dst_slice_pitch,
diff --git a/lib/CL/clCommandCopyBufferToImageKHR.c b/lib/CL/clCommandCopyBufferToImageKHR.c
index 277a28f62e8dedae1d58136c113088368b133cf3..4324a9271a684d2dca6910bdb5ca8baeb29b1084 100644
--- a/lib/CL/clCommandCopyBufferToImageKHR.c
+++ b/lib/CL/clCommandCopyBufferToImageKHR.c
@@ -29,6 +29,7 @@
CL_API_ENTRY cl_int CL_API_CALL
POname (clCommandCopyBufferToImageKHR) (
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
+ const cl_command_properties_khr* properties,
cl_mem src_buffer, cl_mem dst_image, size_t src_offset,
const size_t *dst_origin, const size_t *region,
cl_uint num_sync_points_in_wait_list,
diff --git a/lib/CL/clCommandCopyImageKHR.c b/lib/CL/clCommandCopyImageKHR.c
index dcb1604d6c109d381d2d9c0b7c04d86f8aba917f..386915c914d25dec88dc21410f9c082a6e533830 100644
--- a/lib/CL/clCommandCopyImageKHR.c
+++ b/lib/CL/clCommandCopyImageKHR.c
@@ -31,6 +31,7 @@
extern CL_API_ENTRY cl_int CL_API_CALL
POname (clCommandCopyImageKHR) (
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
+ const cl_command_properties_khr* properties,
cl_mem src_image, cl_mem dst_image, const size_t *src_origin,
const size_t *dst_origin, const size_t *region,
cl_uint num_sync_points_in_wait_list,
diff --git a/lib/CL/clCommandCopyImageToBufferKHR.c b/lib/CL/clCommandCopyImageToBufferKHR.c
index 62732d845f055171792ffd6a9f14e39f32a8d6b8..9b278d9ad970584b04321d6043e9ecb8f6871851 100644
--- a/lib/CL/clCommandCopyImageToBufferKHR.c
+++ b/lib/CL/clCommandCopyImageToBufferKHR.c
@@ -29,6 +29,7 @@
extern CL_API_ENTRY cl_int CL_API_CALL
POname (clCommandCopyImageToBufferKHR) (
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
+ const cl_command_properties_khr* properties,
cl_mem src_image, cl_mem dst_buffer, const size_t *src_origin,
const size_t *region, size_t dst_offset,
cl_uint num_sync_points_in_wait_list,
diff --git a/lib/CL/clCommandFillBufferKHR.c b/lib/CL/clCommandFillBufferKHR.c
index aefe51966025b6b808e9c87cec0033bef4515aac..bc569a2e67f288d294f161a5d70edb50e6f93174 100644
--- a/lib/CL/clCommandFillBufferKHR.c
+++ b/lib/CL/clCommandFillBufferKHR.c
@@ -29,6 +29,7 @@
CL_API_ENTRY cl_int
POname (clCommandFillBufferKHR) (
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
+ const cl_command_properties_khr* properties,
cl_mem buffer, const void *pattern, size_t pattern_size, size_t offset,
size_t size, cl_uint num_sync_points_in_wait_list,
const cl_sync_point_khr *sync_point_wait_list,
diff --git a/lib/CL/clCommandFillImageKHR.c b/lib/CL/clCommandFillImageKHR.c
index af8cd58efc4f70f524fc9ee1044edd9339e55bc2..87b39c12a9ed6694a855b41b3cc1477f7718a544 100644
--- a/lib/CL/clCommandFillImageKHR.c
+++ b/lib/CL/clCommandFillImageKHR.c
@@ -32,6 +32,7 @@
CL_API_ENTRY cl_int
POname (clCommandFillImageKHR) (
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
+ const cl_command_properties_khr* properties,
cl_mem image, const void *fill_color, const size_t *origin,
const size_t *region, cl_uint num_sync_points_in_wait_list,
const cl_sync_point_khr *sync_point_wait_list,
diff --git a/lib/CL/clCommandNDRangeKernelKHR.c b/lib/CL/clCommandNDRangeKernelKHR.c
index 8c94ecc0cd3038909e1b76290ebb5ca0df6839ac..46d5578164d0679ece981bb0b19a670ee7be7d95 100644
--- a/lib/CL/clCommandNDRangeKernelKHR.c
+++ b/lib/CL/clCommandNDRangeKernelKHR.c
@@ -29,7 +29,7 @@
CL_API_ENTRY cl_int
POname (clCommandNDRangeKernelKHR) (
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
- const cl_ndrange_kernel_command_properties_khr *properties,
+ const cl_command_properties_khr* properties,
cl_kernel kernel, cl_uint work_dim, const size_t *global_work_offset,
const size_t *global_work_size, const size_t *local_work_size,
cl_uint num_sync_points_in_wait_list,
diff --git a/lib/CL/clCommandSVMMemFillKHR.c b/lib/CL/clCommandSVMMemFillKHR.c
index 06fb71f75ab6ccd1ca785342e36acb29fbd278ff..0fa9ee738b54b9f2034d402567210e0cc9f8f6e5 100644
--- a/lib/CL/clCommandSVMMemFillKHR.c
+++ b/lib/CL/clCommandSVMMemFillKHR.c
@@ -29,6 +29,7 @@
CL_API_ENTRY cl_int
POname (clCommandSVMMemFillKHR) (
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
+ const cl_command_properties_khr* properties,
void *svm_ptr, const void *pattern,
size_t pattern_size, size_t size,
cl_uint num_sync_points_in_wait_list,
diff --git a/lib/CL/clCommandSVMMemcpyKHR.c b/lib/CL/clCommandSVMMemcpyKHR.c
index 84d29e21bca5b790d5afed8b01f4719a04f94f13..1836bc4df6d2870960f9358c8db49e6f70ab5bf6 100644
--- a/lib/CL/clCommandSVMMemcpyKHR.c
+++ b/lib/CL/clCommandSVMMemcpyKHR.c
@@ -29,6 +29,7 @@
CL_API_ENTRY cl_int
POname (clCommandSVMMemcpyKHR) (
cl_command_buffer_khr command_buffer, cl_command_queue command_queue,
+ const cl_command_properties_khr* properties,
void *dst_ptr, const void *src_ptr, size_t size,
cl_uint num_sync_points_in_wait_list,
const cl_sync_point_khr *sync_point_wait_list,
diff --git a/lib/CL/clEnqueueCopyBufferToImage.c b/lib/CL/clEnqueueCopyBufferToImage.c
index 0f02d4aa52cea41b537941ff59bc1e33d3eff361..ac4dbe9c8b0eb2bc9546a5cf86385d778d6873fb 100644
--- a/lib/CL/clEnqueueCopyBufferToImage.c
+++ b/lib/CL/clEnqueueCopyBufferToImage.c
@@ -73,7 +73,7 @@ pocl_copy_buffer_to_image_common (
else
{
return POname (clCommandCopyBufferRectKHR) (
- command_buffer, command_queue, src_buffer, dst_image->buffer,
+ command_buffer, command_queue, NULL, src_buffer, dst_image->buffer,
src_origin, i1d_origin, i1d_region, dst_image->image_row_pitch,
0, dst_image->image_row_pitch, 0, num_items_in_wait_list,
sync_point_wait_list, sync_point, mutable_handle);
diff --git a/lib/CL/clEnqueueCopyImageToBuffer.c b/lib/CL/clEnqueueCopyImageToBuffer.c
index 12e30343712a01be2d1e700b6ae400764cae3dce..11f915086f90f35591df585b28313c02f1b61bac 100644
--- a/lib/CL/clEnqueueCopyImageToBuffer.c
+++ b/lib/CL/clEnqueueCopyImageToBuffer.c
@@ -68,7 +68,7 @@ pocl_copy_image_to_buffer_common (
else
{
return POname (clCommandCopyBufferRectKHR) (
- command_buffer, command_queue, src_image->buffer, dst_buffer,
+ command_buffer, command_queue, NULL, src_image->buffer, dst_buffer,
i1d_origin, dst_origin, i1d_region, src_image->image_row_pitch,
0, src_image->image_row_pitch, 0, num_items_in_wait_list,
sync_point_wait_list, sync_point, mutable_handle);
diff --git a/lib/CL/clEnqueueSVMMemFill.c b/lib/CL/clEnqueueSVMMemFill.c
index 8b7e67ac050645a2caa39d303d7a3d6243d95145..da5804071425ee4dbe46bae6c71871399e479270 100644
--- a/lib/CL/clEnqueueSVMMemFill.c
+++ b/lib/CL/clEnqueueSVMMemFill.c
@@ -95,7 +95,7 @@ pocl_svm_memfill_common (cl_command_buffer_khr command_buffer,
size_t offset = svm_ptr - dst_svm_ptr->vm_ptr;
if (command_buffer)
errcode = POname (clCommandFillBufferKHR) (
- command_buffer, NULL, dst_svm_ptr->shadow_cl_mem, pattern,
+ command_buffer, NULL, NULL, dst_svm_ptr->shadow_cl_mem, pattern,
pattern_size, offset, size, num_items_in_wait_list,
sync_point_wait_list, sync_point, NULL);
else
diff --git a/lib/CL/clEnqueueSVMMemcpy.c b/lib/CL/clEnqueueSVMMemcpy.c
index 4d589bca0500b38c6fe97a3ae3ff1fd4d3de071e..b8debf16ef5a3a908a5d0fdef5aa35afbb48d76d 100644
--- a/lib/CL/clEnqueueSVMMemcpy.c
+++ b/lib/CL/clEnqueueSVMMemcpy.c
@@ -75,7 +75,7 @@ pocl_svm_memcpy_common (cl_command_buffer_khr command_buffer,
buffers. */
if (command_buffer)
errcode = POname (clCommandCopyBufferKHR) (
- command_buffer, NULL, src_svm_ptr->shadow_cl_mem,
+ command_buffer, NULL, NULL, src_svm_ptr->shadow_cl_mem,
dst_svm_ptr->shadow_cl_mem, src_ptr - src_svm_ptr->vm_ptr,
dst_ptr - dst_svm_ptr->vm_ptr, size, num_items_in_wait_list,
sync_point_wait_list, sync_point, NULL);
diff --git a/lib/CL/clRemapCommandBufferKHR.c b/lib/CL/clRemapCommandBufferKHR.c
index 0fe8006d92516abc68d928c15bd5ac81a5813239..8a79434f7df8adb2182e86b1de9acb1a87add3d4 100644
--- a/lib/CL/clRemapCommandBufferKHR.c
+++ b/lib/CL/clRemapCommandBufferKHR.c
@@ -73,13 +73,13 @@ POname (clRemapCommandBufferKHR) (cl_command_buffer_khr command_buffer,
{
case CL_COMMAND_BARRIER:
errcode = POname (clCommandBarrierWithWaitListKHR) (
- new_cmdbuf, new_queue,
+ new_cmdbuf, new_queue, NULL,
cmd->sync.syncpoint.num_sync_points_in_wait_list,
cmd->sync.syncpoint.sync_point_wait_list, NULL, NULL);
break;
case CL_COMMAND_COPY_BUFFER:
errcode = POname (clCommandCopyBufferKHR) (
- new_cmdbuf, new_queue, cmd->command.copy.src, cmd->command.copy.dst,
+ new_cmdbuf, new_queue, NULL, cmd->command.copy.src, cmd->command.copy.dst,
cmd->command.copy.src_offset, cmd->command.copy.dst_offset,
cmd->command.copy.size,
cmd->sync.syncpoint.num_sync_points_in_wait_list,
@@ -87,7 +87,7 @@ POname (clRemapCommandBufferKHR) (cl_command_buffer_khr command_buffer,
break;
case CL_COMMAND_COPY_BUFFER_RECT:
errcode = POname (clCommandCopyBufferRectKHR) (
- new_cmdbuf, new_queue, cmd->command.copy_rect.src,
+ new_cmdbuf, new_queue, NULL, cmd->command.copy_rect.src,
cmd->command.copy_rect.dst, cmd->command.copy_rect.src_origin,
cmd->command.copy_rect.dst_origin, cmd->command.copy_rect.region,
cmd->command.copy_rect.src_row_pitch,
@@ -99,7 +99,7 @@ POname (clRemapCommandBufferKHR) (cl_command_buffer_khr command_buffer,
break;
case CL_COMMAND_COPY_BUFFER_TO_IMAGE:
errcode = POname (clCommandCopyBufferToImageKHR) (
- new_cmdbuf, new_queue, cmd->command.write_image.src,
+ new_cmdbuf, new_queue, NULL, cmd->command.write_image.src,
cmd->command.write_image.dst, cmd->command.write_image.src_offset,
cmd->command.write_image.origin, cmd->command.write_image.region,
cmd->sync.syncpoint.num_sync_points_in_wait_list,
@@ -107,7 +107,7 @@ POname (clRemapCommandBufferKHR) (cl_command_buffer_khr command_buffer,
break;
case CL_COMMAND_COPY_IMAGE_TO_BUFFER:
errcode = POname (clCommandCopyImageToBufferKHR) (
- new_cmdbuf, new_queue, cmd->command.read_image.src,
+ new_cmdbuf, new_queue, NULL, cmd->command.read_image.src,
cmd->command.read_image.dst, cmd->command.read_image.origin,
cmd->command.read_image.region, cmd->command.read_image.dst_offset,
cmd->sync.syncpoint.num_sync_points_in_wait_list,
@@ -115,7 +115,7 @@ POname (clRemapCommandBufferKHR) (cl_command_buffer_khr command_buffer,
break;
case CL_COMMAND_COPY_IMAGE:
errcode = POname (clCommandCopyImageKHR) (
- new_cmdbuf, new_queue, cmd->command.copy_image.src,
+ new_cmdbuf, new_queue, NULL, cmd->command.copy_image.src,
cmd->command.copy_image.dst, cmd->command.copy_image.src_origin,
cmd->command.copy_image.dst_origin, cmd->command.copy_image.region,
cmd->sync.syncpoint.num_sync_points_in_wait_list,
@@ -124,7 +124,7 @@ POname (clRemapCommandBufferKHR) (cl_command_buffer_khr command_buffer,
case CL_COMMAND_FILL_BUFFER:
errcode = POname (clCommandFillBufferKHR) (
- new_cmdbuf, new_queue, cmd->command.memfill.dst,
+ new_cmdbuf, new_queue, NULL, cmd->command.memfill.dst,
cmd->command.memfill.pattern, cmd->command.memfill.pattern_size,
cmd->command.memfill.offset, cmd->command.memfill.size,
cmd->sync.syncpoint.num_sync_points_in_wait_list,
@@ -132,7 +132,7 @@ POname (clRemapCommandBufferKHR) (cl_command_buffer_khr command_buffer,
break;
case CL_COMMAND_FILL_IMAGE:
errcode = POname (clCommandFillImageKHR) (
- new_cmdbuf, new_queue, cmd->command.fill_image.dst,
+ new_cmdbuf, new_queue, NULL, cmd->command.fill_image.dst,
cmd->command.fill_image.fill_pixel, cmd->command.fill_image.origin,
cmd->command.fill_image.region,
cmd->sync.syncpoint.num_sync_points_in_wait_list,
@@ -195,7 +195,7 @@ POname (clRemapCommandBufferKHR) (cl_command_buffer_khr command_buffer,
case CL_COMMAND_SVM_MEMCPY:
errcode = POname (clCommandSVMMemcpyKHR) (
- new_cmdbuf, new_queue, cmd->command.svm_memcpy.dst,
+ new_cmdbuf, new_queue, NULL, cmd->command.svm_memcpy.dst,
cmd->command.svm_memcpy.src, cmd->command.svm_memcpy.size,
cmd->sync.syncpoint.num_sync_points_in_wait_list,
cmd->sync.syncpoint.sync_point_wait_list, NULL, NULL);
diff --git a/lib/CL/devices/common.c b/lib/CL/devices/common.c
index acd493c084e341960547ddaea104ddf3fd80aa9b..c76b88441bf5f286d4ab854ab44f46b193594f6a 100644
--- a/lib/CL/devices/common.c
+++ b/lib/CL/devices/common.c
@@ -1922,7 +1922,7 @@ static const cl_name_version OPENCL_EXTENSIONS[]
{ CL_MAKE_VERSION (1, 0, 0), "cl_khr_pci_bus_info" },
{ CL_MAKE_VERSION (1, 0, 0), "cl_khr_device_uuid" },
- { CL_MAKE_VERSION (0, 9, 4), "cl_khr_command_buffer" },
+ { CL_MAKE_VERSION (0, 9, 5), "cl_khr_command_buffer" },
{ CL_MAKE_VERSION (0, 9, 1), "cl_khr_command_buffer_multi_device" },
{ CL_MAKE_VERSION (1, 0, 0), "cl_ext_float_atomics" },
{ CL_MAKE_VERSION (0, 1, 0), "cl_ext_buffer_device_address" },
diff --git a/lib/CL/pocl_fill_memobj.c b/lib/CL/pocl_fill_memobj.c
index 59817a9161116112bd2c9e58e13d6f7875d3fec0..ff4c734c496b998b2cf4e0d820b2f8c2e0b0ac45 100644
--- a/lib/CL/pocl_fill_memobj.c
+++ b/lib/CL/pocl_fill_memobj.c
@@ -207,7 +207,7 @@ pocl_fill_image_common (cl_command_buffer_khr command_buffer,
else
{
return POname (clCommandFillBufferKHR) (
- command_buffer, command_queue, image->buffer, fill_pattern, px,
+ command_buffer, command_queue, NULL, image->buffer, fill_pattern, px,
origin[0] * px, region[0] * px, num_items_in_wait_list,
sync_point_wait_list, sync_point, mutable_handle);
}
diff --git a/lib/CL/pocl_ndrange_kernel.c b/lib/CL/pocl_ndrange_kernel.c
index 7931a832fe5838cb9183c99bb19697c605d69c9b..b6fa3b8ca78a00b2869ede7f186a3a41c3c3a243 100644
--- a/lib/CL/pocl_ndrange_kernel.c
+++ b/lib/CL/pocl_ndrange_kernel.c
@@ -388,13 +388,13 @@ pocl_kernel_copy_args (cl_kernel kernel,
static int
process_command_ndrange_properties (
- const cl_ndrange_kernel_command_properties_khr *properties)
+ const cl_command_properties_khr *properties)
{
if (properties == NULL)
return CL_SUCCESS;
cl_uint num_properties = 0;
- const cl_ndrange_kernel_command_properties_khr *key = NULL;
+ const cl_command_properties_khr *key = NULL;
for (key = properties; *key != 0; key += 2)
num_properties += 1;
POCL_RETURN_ERROR_ON ((num_properties == 0), CL_INVALID_VALUE,
@@ -413,7 +413,7 @@ process_command_ndrange_properties (
default:
POCL_RETURN_ERROR_ON (1, CL_INVALID_VALUE,
"Unknown property value in "
- "cl_ndrange_kernel_command_properties_khr\n");
+ "cl_command_properties_khr\n");
}
}
@@ -421,10 +421,9 @@ process_command_ndrange_properties (
}
cl_int
-pocl_record_ndrange_kernel (
- cl_command_buffer_khr command_buffer,
+pocl_record_ndrange_kernel (cl_command_buffer_khr command_buffer,
cl_command_queue command_queue,
- const cl_ndrange_kernel_command_properties_khr *properties,
+ const cl_command_properties_khr *properties,
cl_kernel kernel,
struct pocl_argument *src_arguments,
cl_uint work_dim,
@@ -473,7 +472,7 @@ cl_int
pocl_ndrange_kernel_common (
cl_command_buffer_khr command_buffer,
cl_command_queue command_queue,
- const cl_ndrange_kernel_command_properties_khr *properties,
+ const cl_command_properties_khr *properties,
cl_kernel kernel,
struct pocl_argument *src_arguments,
cl_uint work_dim,
diff --git a/lib/CL/pocl_shared.h b/lib/CL/pocl_shared.h
index 6f3434629f966533a6b63919a35a2b93d98a8bb7..65320d88ec854cc965dbbc62982d2b6b0db3e35b 100644
--- a/lib/CL/pocl_shared.h
+++ b/lib/CL/pocl_shared.h
@@ -87,7 +87,7 @@ cl_int pocl_kernel_copy_args (cl_kernel kernel,
cl_int pocl_ndrange_kernel_common (
cl_command_buffer_khr command_buffer,
cl_command_queue command_queue,
- const cl_ndrange_kernel_command_properties_khr *properties,
+ const cl_command_properties_khr *properties,
cl_kernel kernel,
struct pocl_argument *src_arguments,
cl_uint work_dim,
@@ -104,7 +104,7 @@ cl_int pocl_ndrange_kernel_common (
cl_int pocl_record_ndrange_kernel (
cl_command_buffer_khr command_buffer,
cl_command_queue command_queue,
- const cl_ndrange_kernel_command_properties_khr *properties,
+ const cl_command_properties_khr *properties,
cl_kernel kernel,
struct pocl_argument *src_arguments,
cl_uint work_dim,
diff --git a/tests/runtime/test_command_buffer.c b/tests/runtime/test_command_buffer.c
index fca17585d648993c0f31f85e17e496b266a6c23a..29280bb5c8f78ed0276fa2e32883bdcfbd117e0b 100644
--- a/tests/runtime/test_command_buffer.c
+++ b/tests/runtime/test_command_buffer.c
@@ -141,7 +141,7 @@ main (int _argc, char **_argv)
{
cl_sync_point_khr copy_sync_points[2];
CHECK_CL_ERROR (ext.clCommandCopyBufferKHR (
- command_buffer, NULL, buffer_src1, buffer_tile1,
+ command_buffer, NULL, NULL, buffer_src1, buffer_tile1,
tile_index * tile_size, 0, tile_size, tile_sync_point ? 1 : 0,
tile_sync_point ? &tile_sync_point : NULL, ©_sync_points[0],
NULL));
@@ -151,7 +151,7 @@ main (int _argc, char **_argv)
size_t dst_origin[3] = { 0, 0, 0 };
size_t tile_region[3] = { 8 * sizeof (cl_int), 8, 1 };
CHECK_CL_ERROR (ext.clCommandCopyBufferRectKHR (
- command_buffer, NULL, buffer_src2, buffer_tile2, src_origin,
+ command_buffer, NULL, NULL, buffer_src2, buffer_tile2, src_origin,
dst_origin, tile_region, tile_region[0], 0, tile_region[0], 0,
tile_sync_point ? 1 : 0, tile_sync_point ? &tile_sync_point : NULL,
©_sync_points[1], NULL));
@@ -163,24 +163,24 @@ main (int _argc, char **_argv)
cl_sync_point_khr res_copy_sync_point;
CHECK_CL_ERROR (ext.clCommandCopyBufferKHR (
- command_buffer, NULL, buffer_res, buffer_dst, 0,
+ command_buffer, NULL, NULL, buffer_res, buffer_dst, 0,
tile_index * tile_size, tile_size, 1, &nd_sync_point,
&res_copy_sync_point, NULL));
char zero = 0;
cl_sync_point_khr fill_sync_points[2];
CHECK_CL_ERROR (ext.clCommandFillBufferKHR (
- command_buffer, NULL, buffer_tile1, &zero, sizeof (zero), 0,
+ command_buffer, NULL, NULL, buffer_tile1, &zero, sizeof (zero), 0,
tile_size, 1, &nd_sync_point, &fill_sync_points[0], NULL));
CHECK_CL_ERROR (ext.clCommandFillBufferKHR (
- command_buffer, NULL, buffer_tile2, &zero, sizeof (zero), 0,
+ command_buffer, NULL, NULL, buffer_tile2, &zero, sizeof (zero), 0,
tile_size, 1, &nd_sync_point, &fill_sync_points[1], NULL));
cl_sync_point_khr barrier_deps[4]
= { nd_sync_point, res_copy_sync_point, fill_sync_points[0],
fill_sync_points[1] };
CHECK_CL_ERROR (ext.clCommandBarrierWithWaitListKHR (
- command_buffer, NULL, 4, barrier_deps, &tile_sync_point, NULL));
+ command_buffer, NULL, NULL, 4, barrier_deps, &tile_sync_point, NULL));
}
CHECK_CL_ERROR (ext.clFinalizeCommandBufferKHR (command_buffer));
diff --git a/tests/runtime/test_command_buffer_images.c b/tests/runtime/test_command_buffer_images.c
index 7310600dc6e7fab58791960622b9e0d35a40e685..6656d089a1068b98fa289ed399a1463623333c46 100644
--- a/tests/runtime/test_command_buffer_images.c
+++ b/tests/runtime/test_command_buffer_images.c
@@ -129,21 +129,21 @@ main (int _argc, char **_argv)
cl_sync_point_khr fill_syncpt;
size_t origin[3] = { 0, 0, 0 };
size_t region[3] = { img_width, img_height, img_depth };
- CHECK_CL_ERROR (ext.clCommandFillImageKHR (command_buffer, NULL, img1,
+ CHECK_CL_ERROR (ext.clCommandFillImageKHR (command_buffer, NULL, NULL, img1,
fill_pixel, origin, region, 0,
NULL, &fill_syncpt, NULL));
cl_sync_point_khr buf2img_syncpt;
CHECK_CL_ERROR (ext.clCommandCopyBufferToImageKHR (
- command_buffer, NULL, buffer, img2, 0, origin, region, 0, NULL,
+ command_buffer, NULL, NULL, buffer, img2, 0, origin, region, 0, NULL,
&buf2img_syncpt, NULL));
cl_sync_point_khr img2img_syncpt;
cl_sync_point_khr img2img_deps[2] = { fill_syncpt, buf2img_syncpt };
CHECK_CL_ERROR (ext.clCommandCopyImageKHR (
- command_buffer, NULL, img2, img1, img2img_origin, img2img_origin,
+ command_buffer, NULL, NULL, img2, img1, img2img_origin, img2img_origin,
img2img_region, 2, img2img_deps, &img2img_syncpt, NULL));
CHECK_CL_ERROR (ext.clCommandCopyImageToBufferKHR (
- command_buffer, NULL, img1, buffer, origin, region, 0, 1,
+ command_buffer, NULL, NULL, img1, buffer, origin, region, 0, 1,
&img2img_syncpt, NULL, NULL));
}
diff --git a/tests/runtime/test_command_buffer_multi_device.c b/tests/runtime/test_command_buffer_multi_device.c
index 36bc3ecf14ea423eb00d41263d6c9d88ac8bfc3e..67f06e8e70073f2b5145fce5b042ea718e93ac47 100644
--- a/tests/runtime/test_command_buffer_multi_device.c
+++ b/tests/runtime/test_command_buffer_multi_device.c
@@ -232,7 +232,7 @@ main (int _argc, char **_argv)
{
cl_sync_point_khr copy_sync_points[2];
CHECK_CL_ERROR (ext.clCommandCopyBufferKHR (
- command_buffer, queues[tile_index % num_devices], buffer_src1,
+ command_buffer, queues[tile_index % num_devices], NULL, buffer_src1,
buffer_tile1, tile_index * tile_size, 0, tile_size,
tile_sync_point ? 1 : 0, tile_sync_point ? &tile_sync_point : NULL,
©_sync_points[0], NULL));
@@ -242,7 +242,7 @@ main (int _argc, char **_argv)
size_t dst_origin[3] = { 0, 0, 0 };
size_t tile_region[3] = { 8 * sizeof (cl_int), 8, 1 };
CHECK_CL_ERROR (ext.clCommandCopyBufferRectKHR (
- command_buffer, queues[tile_index % num_devices], buffer_src2,
+ command_buffer, queues[tile_index % num_devices], NULL, buffer_src2,
buffer_tile2, src_origin, dst_origin, tile_region, tile_region[0], 0,
tile_region[0], 0, tile_sync_point ? 1 : 0,
tile_sync_point ? &tile_sync_point : NULL, ©_sync_points[1],
@@ -256,18 +256,18 @@ main (int _argc, char **_argv)
cl_sync_point_khr res_copy_sync_point;
CHECK_CL_ERROR (ext.clCommandCopyBufferKHR (
- command_buffer, queues[tile_index % num_devices], buffer_res,
+ command_buffer, queues[tile_index % num_devices], NULL, buffer_res,
buffer_dst, 0, tile_index * tile_size, tile_size, 1, &nd_sync_point,
&res_copy_sync_point, NULL));
char zero = 0;
cl_sync_point_khr fill_sync_points[2];
CHECK_CL_ERROR (ext.clCommandFillBufferKHR (
- command_buffer, queues[tile_index % num_devices], buffer_tile1, &zero,
+ command_buffer, queues[tile_index % num_devices], NULL, buffer_tile1, &zero,
sizeof (zero), 0, tile_size, 1, &nd_sync_point, &fill_sync_points[0],
NULL));
CHECK_CL_ERROR (ext.clCommandFillBufferKHR (
- command_buffer, queues[tile_index % num_devices], buffer_tile2, &zero,
+ command_buffer, queues[tile_index % num_devices], NULL, buffer_tile2, &zero,
sizeof (zero), 0, tile_size, 1, &nd_sync_point, &fill_sync_points[1],
NULL));
@@ -275,7 +275,7 @@ main (int _argc, char **_argv)
= { nd_sync_point, res_copy_sync_point, fill_sync_points[0],
fill_sync_points[1] };
CHECK_CL_ERROR (ext.clCommandBarrierWithWaitListKHR (
- command_buffer, queues[tile_index % num_devices], 4, barrier_deps,
+ command_buffer, queues[tile_index % num_devices], NULL, 4, barrier_deps,
&tile_sync_point, NULL));
}