From 11782f76506d256ed6e08fa1b2d6b88a93bec7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= Date: Tue, 7 Feb 2023 17:58:48 +0100 Subject: [PATCH] Fixed EnqueueAcquire and EnqueueRelease calls to be compliant with the spec. (#1629) --- .../cl_khr_dx9_media_sharing/test_functions_api.cpp | 4 ++-- .../test_functions_kernel.cpp | 8 ++++---- .../cl_khr_dx9_media_sharing/test_interop_sync.cpp | 4 ++-- .../cl_khr_dx9_media_sharing/test_memory_access.cpp | 12 ++++++------ .../test_other_data_types.cpp | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/test_conformance/extensions/cl_khr_dx9_media_sharing/test_functions_api.cpp b/test_conformance/extensions/cl_khr_dx9_media_sharing/test_functions_api.cpp index ab92cb89..68db364c 100644 --- a/test_conformance/extensions/cl_khr_dx9_media_sharing/test_functions_api.cpp +++ b/test_conformance/extensions/cl_khr_dx9_media_sharing/test_functions_api.cpp @@ -175,7 +175,7 @@ int api_functions(cl_device_id deviceID, cl_context context, error = clEnqueueAcquireDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList[0], 0, 0, 0); + &memObjList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueAcquireDX9MediaSurfacesKHR failed: %s\n", @@ -627,7 +627,7 @@ int api_functions(cl_device_id deviceID, cl_context context, error = clEnqueueReleaseDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList[0], 0, 0, 0); + &memObjList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueReleaseDX9MediaSurfacesKHR failed: %s\n", diff --git a/test_conformance/extensions/cl_khr_dx9_media_sharing/test_functions_kernel.cpp b/test_conformance/extensions/cl_khr_dx9_media_sharing/test_functions_kernel.cpp index a204440d..84761223 100644 --- a/test_conformance/extensions/cl_khr_dx9_media_sharing/test_functions_kernel.cpp +++ b/test_conformance/extensions/cl_khr_dx9_media_sharing/test_functions_kernel.cpp @@ -224,7 +224,7 @@ int kernel_functions(cl_device_id deviceID, cl_context context, error = clEnqueueAcquireDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjSrcList.size()), - &memObjSrcList[0], 0, 0, 0); + &memObjSrcList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueAcquireDX9MediaSurfacesKHR failed: %s\n", @@ -235,7 +235,7 @@ int kernel_functions(cl_device_id deviceID, cl_context context, error = clEnqueueAcquireDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjDstList.size()), - &memObjDstList[0], 0, 0, 0); + &memObjDstList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueAcquireDX9MediaSurfacesKHR failed: %s\n", @@ -377,7 +377,7 @@ int kernel_functions(cl_device_id deviceID, cl_context context, error = clEnqueueReleaseDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjSrcList.size()), - &memObjSrcList[0], 0, 0, 0); + &memObjSrcList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueReleaseDX9MediaSurfacesKHR failed: %s\n", @@ -387,7 +387,7 @@ int kernel_functions(cl_device_id deviceID, cl_context context, error = clEnqueueReleaseDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjDstList.size()), - &memObjDstList[0], 0, 0, 0); + &memObjDstList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueReleaseDX9MediaSurfacesKHR failed: %s\n", diff --git a/test_conformance/extensions/cl_khr_dx9_media_sharing/test_interop_sync.cpp b/test_conformance/extensions/cl_khr_dx9_media_sharing/test_interop_sync.cpp index fbc616e2..280f47b5 100644 --- a/test_conformance/extensions/cl_khr_dx9_media_sharing/test_interop_sync.cpp +++ b/test_conformance/extensions/cl_khr_dx9_media_sharing/test_interop_sync.cpp @@ -233,7 +233,7 @@ int interop_user_sync(cl_device_id deviceID, cl_context context, error = clEnqueueAcquireDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList.at(0), 0, 0, 0); + &memObjList.at(0), 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueAcquireDX9MediaSurfacesKHR failed: %s\n", @@ -273,7 +273,7 @@ int interop_user_sync(cl_device_id deviceID, cl_context context, error = clEnqueueReleaseDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList.at(0), 0, 0, 0); + &memObjList.at(0), 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueReleaseDX9MediaSurfacesKHR failed: %s\n", diff --git a/test_conformance/extensions/cl_khr_dx9_media_sharing/test_memory_access.cpp b/test_conformance/extensions/cl_khr_dx9_media_sharing/test_memory_access.cpp index 1e4e2c4e..c7242422 100644 --- a/test_conformance/extensions/cl_khr_dx9_media_sharing/test_memory_access.cpp +++ b/test_conformance/extensions/cl_khr_dx9_media_sharing/test_memory_access.cpp @@ -153,7 +153,7 @@ int memory_access(cl_device_id deviceID, cl_context context, error = clEnqueueAcquireDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList[0], 0, 0, 0); + &memObjList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueAcquireDX9MediaSurfacesKHR failed: %s\n", @@ -185,7 +185,7 @@ int memory_access(cl_device_id deviceID, cl_context context, error = clEnqueueReleaseDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList[0], 0, 0, 0); + &memObjList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueReleaseDX9MediaSurfacesKHR failed: %s\n", @@ -239,7 +239,7 @@ int memory_access(cl_device_id deviceID, cl_context context, error = clEnqueueAcquireDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList[0], 0, 0, 0); + &memObjList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueAcquireDX9MediaSurfacesKHR failed: %s\n", @@ -279,7 +279,7 @@ int memory_access(cl_device_id deviceID, cl_context context, error = clEnqueueReleaseDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList[0], 0, 0, 0); + &memObjList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueReleaseDX9MediaSurfacesKHR failed: %s\n", @@ -333,7 +333,7 @@ int memory_access(cl_device_id deviceID, cl_context context, error = clEnqueueAcquireDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList[0], 0, 0, 0); + &memObjList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueAcquireDX9MediaSurfacesKHR failed: %s\n", @@ -399,7 +399,7 @@ int memory_access(cl_device_id deviceID, cl_context context, error = clEnqueueReleaseDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList[0], 0, 0, 0); + &memObjList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueReleaseDX9MediaSurfacesKHR failed: %s\n", diff --git a/test_conformance/extensions/cl_khr_dx9_media_sharing/test_other_data_types.cpp b/test_conformance/extensions/cl_khr_dx9_media_sharing/test_other_data_types.cpp index 0e5d1d12..8ff71279 100644 --- a/test_conformance/extensions/cl_khr_dx9_media_sharing/test_other_data_types.cpp +++ b/test_conformance/extensions/cl_khr_dx9_media_sharing/test_other_data_types.cpp @@ -271,7 +271,7 @@ int other_data_types(cl_device_id deviceID, cl_context context, error = clEnqueueAcquireDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList[0], 0, 0, 0); + &memObjList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueAcquireMediaSurfaceKHR failed: %s\n", @@ -466,7 +466,7 @@ int other_data_types(cl_device_id deviceID, cl_context context, error = clEnqueueReleaseDX9MediaSurfacesKHR( cmdQueue, static_cast(memObjList.size()), - &memObjList[0], 0, 0, 0); + &memObjList[0], 0, NULL, NULL); if (error != CL_SUCCESS) { log_error("clEnqueueReleaseMediaSurfaceKHR failed: %s\n",