Zebediah Figura : opencl: Avoid calling clSetCommandQueueProperty().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ed44832c7d586ab52dab08b0a40d36c9a08ff2b6
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ed44832c7d586ab52dab08b0a40d36c9a08ff2b6

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu Mar 18 23:06:32 2021 -0500

opencl: Avoid calling clSetCommandQueueProperty().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/opencl/make_opencl   | 4 ++++
 dlls/opencl/pe_thunks.c   | 6 ------
 dlls/opencl/pe_wrappers.c | 9 +++++++++
 dlls/opencl/unix_thunks.c | 6 ------
 dlls/opencl/unixlib.h     | 1 -
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl
index 72b7386d1e2..f30967ff384 100755
--- a/dlls/opencl/make_opencl
+++ b/dlls/opencl/make_opencl
@@ -216,6 +216,9 @@ sub needs_pe_wrapper($)
 
             # needs function pointer conversion
             "clGetExtensionFunctionAddress" => 1,
+
+            # deprecated and absent from headers
+            "clSetCommandQueueProperty" => 1,
         );
     my $name = shift;
 
@@ -244,6 +247,7 @@ sub needs_unix_function($)
     my %funcs =
         (
             "clGetExtensionFunctionAddress" => 1,
+            "clSetCommandQueueProperty" => 1,
         );
     my $name = shift;
 
diff --git a/dlls/opencl/pe_thunks.c b/dlls/opencl/pe_thunks.c
index b3b08688d16..eb0466b6286 100644
--- a/dlls/opencl/pe_thunks.c
+++ b/dlls/opencl/pe_thunks.c
@@ -360,12 +360,6 @@ cl_int WINAPI clRetainSampler( cl_sampler sampler )
     return opencl_funcs->pclRetainSampler( sampler );
 }
 
-cl_int WINAPI clSetCommandQueueProperty( cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, cl_command_queue_properties* old_properties )
-{
-    TRACE( "(%p, %s, %u, %p)\n", command_queue, wine_dbgstr_longlong(properties), enable, old_properties );
-    return opencl_funcs->pclSetCommandQueueProperty( command_queue, properties, enable, old_properties );
-}
-
 cl_int WINAPI clSetKernelArg( cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void* arg_value )
 {
     TRACE( "(%p, %u, %Iu, %p)\n", kernel, arg_index, arg_size, arg_value );
diff --git a/dlls/opencl/pe_wrappers.c b/dlls/opencl/pe_wrappers.c
index 37be38c728f..35c78181580 100644
--- a/dlls/opencl/pe_wrappers.c
+++ b/dlls/opencl/pe_wrappers.c
@@ -118,6 +118,15 @@ void * WINAPI clGetExtensionFunctionAddress( const char *func_name )
     return ret;
 }
 
+
+cl_int WINAPI clSetCommandQueueProperty( cl_command_queue command_queue, cl_command_queue_properties properties,
+        cl_bool enable, cl_command_queue_properties *old_properties )
+{
+    FIXME( "(%p, %s, %u, %p) deprecated\n", command_queue, wine_dbgstr_longlong(properties), enable, old_properties );
+    return CL_INVALID_QUEUE_PROPERTIES;
+}
+
+
 BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved )
 {
     if (reason == DLL_PROCESS_ATTACH)
diff --git a/dlls/opencl/unix_thunks.c b/dlls/opencl/unix_thunks.c
index 0fe3a081e0b..579c12eed79 100644
--- a/dlls/opencl/unix_thunks.c
+++ b/dlls/opencl/unix_thunks.c
@@ -292,11 +292,6 @@ static cl_int WINAPI wrap_clRetainSampler( cl_sampler sampler )
     return clRetainSampler( sampler );
 }
 
-static cl_int WINAPI wrap_clSetCommandQueueProperty( cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, cl_command_queue_properties* old_properties )
-{
-    return clSetCommandQueueProperty( command_queue, properties, enable, old_properties );
-}
-
 static cl_int WINAPI wrap_clSetKernelArg( cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void* arg_value )
 {
     return clSetKernelArg( kernel, arg_index, arg_size, arg_value );
@@ -375,7 +370,6 @@ const struct opencl_funcs funcs =
     wrap_clRetainMemObject,
     wrap_clRetainProgram,
     wrap_clRetainSampler,
-    wrap_clSetCommandQueueProperty,
     wrap_clSetKernelArg,
     wrap_clUnloadCompiler,
     wrap_clWaitForEvents,
diff --git a/dlls/opencl/unixlib.h b/dlls/opencl/unixlib.h
index e0d01317db7..d5b1da1b99e 100644
--- a/dlls/opencl/unixlib.h
+++ b/dlls/opencl/unixlib.h
@@ -63,7 +63,6 @@ struct opencl_funcs
     cl_int (WINAPI *pclRetainMemObject)( cl_mem memobj );
     cl_int (WINAPI *pclRetainProgram)( cl_program program );
     cl_int (WINAPI *pclRetainSampler)( cl_sampler sampler );
-    cl_int (WINAPI *pclSetCommandQueueProperty)( cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, cl_command_queue_properties* old_properties );
     cl_int (WINAPI *pclSetKernelArg)( cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void* arg_value );
     cl_int (WINAPI *pclUnloadCompiler)( void  );
     cl_int (WINAPI *pclWaitForEvents)( cl_uint num_events, const cl_event* event_list );