[PATCH 2/3] opencl: Build with msvcrt.

Zebediah Figura z.figura12 at gmail.com
Mon Mar 15 23:44:51 CDT 2021


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/opencl/Makefile.in      |   2 +
 dlls/opencl/make_opencl      |  92 ++++++++--
 dlls/opencl/opencl_private.h |  15 +-
 dlls/opencl/opencl_types.h   | 343 +++++++++++++++++++++++++++++++++++
 dlls/opencl/pe_thunks.c      |  51 +++---
 dlls/opencl/pe_wrappers.c    |   3 +-
 dlls/opencl/unix_private.h   |  14 ++
 7 files changed, 468 insertions(+), 52 deletions(-)
 create mode 100644 dlls/opencl/opencl_types.h

diff --git a/dlls/opencl/Makefile.in b/dlls/opencl/Makefile.in
index 8a6a03175cb..6b2471b914d 100644
--- a/dlls/opencl/Makefile.in
+++ b/dlls/opencl/Makefile.in
@@ -1,6 +1,8 @@
 MODULE    = opencl.dll
 EXTRALIBS = $(OPENCL_LIBS)
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	pe_thunks.c \
 	pe_wrappers.c \
diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl
index fc5d4ad4bf6..6f901d570f0 100755
--- a/dlls/opencl/make_opencl
+++ b/dlls/opencl/make_opencl
@@ -21,6 +21,7 @@ use XML::LibXML;
 # Files to generate
 my $spec_file = "opencl.spec";
 my $pe_file = "pe_thunks.c";
+my $types_file = "opencl_types.h";
 my $unix_file = "unix_thunks.c";
 my $unixheader_file = "unixlib.h";
 
@@ -42,8 +43,8 @@ my %arg_types =
         "int16_t"        => [ "long",   "%d" ],
         "int32_t"        => [ "long",   "%d" ],
         "int64_t"        => [ "int64",  "wine_dbgstr_longlong(%s)" ],
-        "intptr_t"       => [ "long",   "%ld" ],
-        "size_t"         => [ "long",   "%zu" ],
+        "intptr_t"       => [ "long",   "%Id" ],
+        "size_t"         => [ "long",   "%Iu" ],
         "uint8_t"        => [ "long",   "%u" ],
         "uint16_t"       => [ "long",   "%u" ],
         "uint32_t"       => [ "long",   "%u" ],
@@ -237,12 +238,27 @@ sub needs_unix_wrapper($)
     return defined $funcs{$name};
 }
 
+sub generate_struct($)
+{
+    my $type = shift;
+    my $name = $type->{name};
+    my $ret = "typedef struct _$name\n{\n";
+    foreach my $member ($type->findnodes("./member"))
+    {
+        ($member = $member->textContent()) =~ s/ +/ /g;
+        $ret .= "    $member;\n";
+    }
+    $ret .= "} $name;\n";
+    return $ret;
+}
+
 sub parse_file($)
 {
     my $file = shift;
     my $xml = XML::LibXML->load_xml( location => $file );
     my %functions;
     my %enums;
+    my %types;
 
     # save all functions
     foreach my $command ($xml->findnodes("/registry/commands/command"))
@@ -257,20 +273,25 @@ sub parse_file($)
     # save all enums
     foreach my $enum ($xml->findnodes("/registry/enums/enum"))
     {
-        $enums{$enum->{name}} = $enum->{value};
+        if (defined $enum->{value})
+        {
+            $enums{$enum->{name}} = $enum->{value};
+        }
+        else
+        {
+            $enums{$enum->{name}} = "(1 << " . $enum->{bitpos} . ")";
+        }
     }
 
     # save all types
     foreach my $type ($xml->findnodes("/registry/types/type"))
     {
-        my $name = @{$type->findnodes("./name")}[0];
-        next unless $name;
-        $name = $name->textContent;
-        push @cl_types, $name unless $cl_types{$name};
-        $cl_types{$name} = $type;
-
-        if ($type->{category} eq "define" and not defined($arg_types{$name}))
+        if ($type->{category} eq "define")
         {
+            my $name = @{$type->findnodes("./name")}[0];
+            $name = $name->textContent;
+            $types{$name} = $type;
+
             my $basetype = @{$type->findnodes("./type")}[0];
             if ($type->textContent() =~ /[[*]/)
             {
@@ -285,6 +306,11 @@ sub parse_file($)
                 die "No conversion for type $name\n"
             }
         }
+        elsif ($type->{category} eq "struct")
+        {
+            my $name = $type->{name};
+            $types{$name} = $type;
+        }
     }
 
     # generate core functions
@@ -299,6 +325,12 @@ sub parse_file($)
         {
             $cl_enums{$enum->{name}} = $enums{$enum->{name}};
         }
+        foreach my $type ($feature->findnodes("./require/type"))
+        {
+            next unless $types{$type->{name}};
+            push @cl_types, $type->{name} unless $cl_types{$type->{name}};
+            $cl_types{$type->{name}} = $types{$type->{name}};
+        }
     }
 }
 
@@ -319,8 +351,9 @@ open(PE, ">$pe_file") or die "cannot create $pe_file";
 
 print PE "/* Automatically generated from OpenCL registry files; DO NOT EDIT! */\n\n";
 
-print PE "#include \"config.h\"\n";
-print PE "#include \"opencl_private.h\"\n\n";
+print PE "#include \"opencl_private.h\"\n";
+print PE "#include \"opencl_types.h\"\n";
+print PE "#include \"unixlib.h\"\n\n";
 
 print PE "WINE_DEFAULT_DEBUG_CHANNEL(opencl);\n" if $gen_traces;
 
@@ -377,3 +410,38 @@ print UNIXHEADER "};\n\n";
 print UNIXHEADER "extern const struct opencl_funcs *opencl_funcs;\n";
 
 close(UNIXHEADER);
+
+# generate the Win32 type definitions
+open(TYPES, ">$types_file") or die "cannot create $types_file";
+
+print TYPES <<END
+/* Automatically generated from OpenCL registry files; DO NOT EDIT! */
+
+typedef int32_t cl_int DECLSPEC_ALIGN(4);
+typedef uint32_t cl_uint DECLSPEC_ALIGN(4);
+typedef uint64_t cl_ulong DECLSPEC_ALIGN(8);
+
+END
+;
+
+foreach (@cl_types)
+{
+    my $type = $cl_types{$_};
+    if ($type->{category} eq "define")
+    {
+        print TYPES $type->textContent() . "\n";
+    }
+    elsif ($type->{category} eq "struct")
+    {
+        print TYPES generate_struct( $type );
+    }
+}
+
+print TYPES "\n";
+
+foreach (sort keys %cl_enums)
+{
+    printf TYPES "#define %s %s\n", $_, $cl_enums{$_};
+}
+
+close(TYPES);
diff --git a/dlls/opencl/opencl_private.h b/dlls/opencl/opencl_private.h
index ff34dad94db..d88f6b2b8b6 100644
--- a/dlls/opencl/opencl_private.h
+++ b/dlls/opencl/opencl_private.h
@@ -20,6 +20,7 @@
 #define __WINE_OPENCL_PRIVATE_H
 
 #include <stdarg.h>
+#include <stdint.h>
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
@@ -29,18 +30,4 @@
 
 #include "wine/debug.h"
 
-#define CL_SILENCE_DEPRECATION
-#if defined(HAVE_CL_CL_H)
-#define CL_USE_DEPRECATED_OPENCL_1_0_APIS
-#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
-#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
-#define CL_USE_DEPRECATED_OPENCL_2_0_APIS
-#define CL_TARGET_OPENCL_VERSION 220
-#include <CL/cl.h>
-#elif defined(HAVE_OPENCL_OPENCL_H)
-#include <OpenCL/opencl.h>
-#endif
-
-#include "unixlib.h"
-
 #endif
diff --git a/dlls/opencl/opencl_types.h b/dlls/opencl/opencl_types.h
new file mode 100644
index 00000000000..eb5530d0a8d
--- /dev/null
+++ b/dlls/opencl/opencl_types.h
@@ -0,0 +1,343 @@
+/* Automatically generated from OpenCL registry files; DO NOT EDIT! */
+
+typedef int32_t cl_int DECLSPEC_ALIGN(4);
+typedef uint32_t cl_uint DECLSPEC_ALIGN(4);
+typedef uint64_t cl_ulong DECLSPEC_ALIGN(8);
+
+typedef struct _cl_platform_id *      cl_platform_id;
+typedef struct _cl_device_id *        cl_device_id;
+typedef struct _cl_context *          cl_context;
+typedef struct _cl_command_queue *    cl_command_queue;
+typedef struct _cl_mem *              cl_mem;
+typedef struct _cl_program *          cl_program;
+typedef struct _cl_kernel *           cl_kernel;
+typedef struct _cl_event *            cl_event;
+typedef struct _cl_sampler *          cl_sampler;
+typedef cl_uint          cl_bool;
+typedef cl_ulong         cl_bitfield;
+typedef cl_bitfield      cl_device_type;
+typedef cl_uint          cl_platform_info;
+typedef cl_uint          cl_device_info;
+typedef cl_bitfield      cl_device_fp_config;
+typedef cl_uint          cl_device_mem_cache_type;
+typedef cl_uint          cl_device_local_mem_type;
+typedef cl_bitfield      cl_device_exec_capabilities;
+typedef cl_bitfield      cl_command_queue_properties;
+typedef intptr_t         cl_context_properties;
+typedef cl_uint          cl_context_info;
+typedef cl_uint          cl_command_queue_info;
+typedef cl_uint          cl_channel_order;
+typedef cl_uint          cl_channel_type;
+typedef cl_bitfield      cl_mem_flags;
+typedef cl_uint          cl_mem_object_type;
+typedef cl_uint          cl_mem_info;
+typedef cl_uint          cl_image_info;
+typedef cl_uint          cl_addressing_mode;
+typedef cl_uint          cl_filter_mode;
+typedef cl_uint          cl_sampler_info;
+typedef cl_bitfield      cl_map_flags;
+typedef cl_uint          cl_program_info;
+typedef cl_uint          cl_program_build_info;
+typedef cl_int           cl_build_status;
+typedef cl_uint          cl_kernel_info;
+typedef cl_uint          cl_kernel_work_group_info;
+typedef cl_uint          cl_event_info;
+typedef cl_uint          cl_command_type;
+typedef cl_uint          cl_profiling_info;
+typedef struct _cl_image_format
+{
+    cl_channel_order image_channel_order;
+    cl_channel_type image_channel_data_type;
+} cl_image_format;
+typedef struct _cl_buffer_region
+{
+    size_t origin;
+    size_t size;
+} cl_buffer_region;
+
+#define CL_A 0x10B1
+#define CL_ADDRESS_CLAMP 0x1132
+#define CL_ADDRESS_CLAMP_TO_EDGE 0x1131
+#define CL_ADDRESS_NONE 0x1130
+#define CL_ADDRESS_REPEAT 0x1133
+#define CL_ARGB 0x10B7
+#define CL_BGRA 0x10B6
+#define CL_BUILD_ERROR -2
+#define CL_BUILD_IN_PROGRESS -3
+#define CL_BUILD_NONE -1
+#define CL_BUILD_PROGRAM_FAILURE -11
+#define CL_BUILD_SUCCESS 0
+#define CL_CHAR_BIT 8
+#define CL_CHAR_MAX CL_SCHAR_MAX
+#define CL_CHAR_MIN CL_SCHAR_MIN
+#define CL_COMMAND_ACQUIRE_GL_OBJECTS 0x11FF
+#define CL_COMMAND_COPY_BUFFER 0x11F5
+#define CL_COMMAND_COPY_BUFFER_TO_IMAGE 0x11FA
+#define CL_COMMAND_COPY_IMAGE 0x11F8
+#define CL_COMMAND_COPY_IMAGE_TO_BUFFER 0x11F9
+#define CL_COMMAND_MAP_BUFFER 0x11FB
+#define CL_COMMAND_MAP_IMAGE 0x11FC
+#define CL_COMMAND_MARKER 0x11FE
+#define CL_COMMAND_NATIVE_KERNEL 0x11F2
+#define CL_COMMAND_NDRANGE_KERNEL 0x11F0
+#define CL_COMMAND_READ_BUFFER 0x11F3
+#define CL_COMMAND_READ_IMAGE 0x11F6
+#define CL_COMMAND_RELEASE_GL_OBJECTS 0x1200
+#define CL_COMMAND_TASK 0x11F1
+#define CL_COMMAND_UNMAP_MEM_OBJECT 0x11FD
+#define CL_COMMAND_WRITE_BUFFER 0x11F4
+#define CL_COMMAND_WRITE_IMAGE 0x11F7
+#define CL_COMPILER_NOT_AVAILABLE -3
+#define CL_COMPLETE 0x0
+#define CL_CONTEXT_DEVICES 0x1081
+#define CL_CONTEXT_PLATFORM 0x1084
+#define CL_CONTEXT_PROPERTIES 0x1082
+#define CL_CONTEXT_REFERENCE_COUNT 0x1080
+#define CL_DBL_DIG 15
+#define CL_DBL_EPSILON 2.220446049250313080847e-16
+#define CL_DBL_MANT_DIG 53
+#define CL_DBL_MAX 1.7976931348623158e+308
+#define CL_DBL_MAX_10_EXP +308
+#define CL_DBL_MAX_EXP +1024
+#define CL_DBL_MIN 2.225073858507201383090e-308
+#define CL_DBL_MIN_10_EXP -307
+#define CL_DBL_MIN_EXP -1021
+#define CL_DBL_RADIX 2
+#define CL_DEVICE_ADDRESS_BITS 0x100D
+#define CL_DEVICE_AVAILABLE 0x1027
+#define CL_DEVICE_COMPILER_AVAILABLE 0x1028
+#define CL_DEVICE_ENDIAN_LITTLE 0x1026
+#define CL_DEVICE_ERROR_CORRECTION_SUPPORT 0x1024
+#define CL_DEVICE_EXECUTION_CAPABILITIES 0x1029
+#define CL_DEVICE_EXTENSIONS 0x1030
+#define CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE 0x101D
+#define CL_DEVICE_GLOBAL_MEM_CACHE_SIZE 0x101E
+#define CL_DEVICE_GLOBAL_MEM_CACHE_TYPE 0x101C
+#define CL_DEVICE_GLOBAL_MEM_SIZE 0x101F
+#define CL_DEVICE_IMAGE2D_MAX_HEIGHT 0x1012
+#define CL_DEVICE_IMAGE2D_MAX_WIDTH 0x1011
+#define CL_DEVICE_IMAGE3D_MAX_DEPTH 0x1015
+#define CL_DEVICE_IMAGE3D_MAX_HEIGHT 0x1014
+#define CL_DEVICE_IMAGE3D_MAX_WIDTH 0x1013
+#define CL_DEVICE_IMAGE_SUPPORT 0x1016
+#define CL_DEVICE_LOCAL_MEM_SIZE 0x1023
+#define CL_DEVICE_LOCAL_MEM_TYPE 0x1022
+#define CL_DEVICE_MAX_CLOCK_FREQUENCY 0x100C
+#define CL_DEVICE_MAX_COMPUTE_UNITS 0x1002
+#define CL_DEVICE_MAX_CONSTANT_ARGS 0x1021
+#define CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE 0x1020
+#define CL_DEVICE_MAX_MEM_ALLOC_SIZE 0x1010
+#define CL_DEVICE_MAX_PARAMETER_SIZE 0x1017
+#define CL_DEVICE_MAX_READ_IMAGE_ARGS 0x100E
+#define CL_DEVICE_MAX_SAMPLERS 0x1018
+#define CL_DEVICE_MAX_WORK_GROUP_SIZE 0x1004
+#define CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS 0x1003
+#define CL_DEVICE_MAX_WORK_ITEM_SIZES 0x1005
+#define CL_DEVICE_MAX_WRITE_IMAGE_ARGS 0x100F
+#define CL_DEVICE_MEM_BASE_ADDR_ALIGN 0x1019
+#define CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE 0x101A
+#define CL_DEVICE_NAME 0x102B
+#define CL_DEVICE_NOT_AVAILABLE -2
+#define CL_DEVICE_NOT_FOUND -1
+#define CL_DEVICE_PLATFORM 0x1031
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR 0x1006
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE 0x100B
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT 0x100A
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT 0x1008
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG 0x1009
+#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT 0x1007
+#define CL_DEVICE_PROFILE 0x102E
+#define CL_DEVICE_PROFILING_TIMER_RESOLUTION 0x1025
+#define CL_DEVICE_QUEUE_PROPERTIES 0x102A
+#define CL_DEVICE_SINGLE_FP_CONFIG 0x101B
+#define CL_DEVICE_TYPE 0x1000
+#define CL_DEVICE_TYPE_ACCELERATOR (1 << 3)
+#define CL_DEVICE_TYPE_ALL 0xFFFFFFFF
+#define CL_DEVICE_TYPE_CPU (1 << 1)
+#define CL_DEVICE_TYPE_DEFAULT (1 << 0)
+#define CL_DEVICE_TYPE_GPU (1 << 2)
+#define CL_DEVICE_VENDOR 0x102C
+#define CL_DEVICE_VENDOR_ID 0x1001
+#define CL_DEVICE_VERSION 0x102F
+#define CL_DRIVER_VERSION 0x102D
+#define CL_EVENT_COMMAND_EXECUTION_STATUS 0x11D3
+#define CL_EVENT_COMMAND_QUEUE 0x11D0
+#define CL_EVENT_COMMAND_TYPE 0x11D1
+#define CL_EVENT_REFERENCE_COUNT 0x11D2
+#define CL_EXEC_KERNEL (1 << 0)
+#define CL_EXEC_NATIVE_KERNEL (1 << 1)
+#define CL_FALSE 0
+#define CL_FILTER_LINEAR 0x1141
+#define CL_FILTER_NEAREST 0x1140
+#define CL_FLOAT 0x10DE
+#define CL_FLT_DIG 6
+#define CL_FLT_EPSILON 1.1920928955078125e-7f
+#define CL_FLT_MANT_DIG 24
+#define CL_FLT_MAX 340282346638528859811704183484516925440.0f
+#define CL_FLT_MAX_10_EXP +38
+#define CL_FLT_MAX_EXP +128
+#define CL_FLT_MIN 1.175494350822287507969e-38f
+#define CL_FLT_MIN_10_EXP -37
+#define CL_FLT_MIN_EXP -125
+#define CL_FLT_RADIX 2
+#define CL_FP_DENORM (1 << 0)
+#define CL_FP_FMA (1 << 5)
+#define CL_FP_INF_NAN (1 << 1)
+#define CL_FP_ROUND_TO_INF (1 << 4)
+#define CL_FP_ROUND_TO_NEAREST (1 << 2)
+#define CL_FP_ROUND_TO_ZERO (1 << 3)
+#define CL_GLOBAL 0x2
+#define CL_HALF_FLOAT 0x10DD
+#define CL_HUGE_VAL ((cl_double) 1e500)
+#define CL_HUGE_VALF ((cl_float) 1e50)
+#define CL_IMAGE_DEPTH 0x1116
+#define CL_IMAGE_ELEMENT_SIZE 0x1111
+#define CL_IMAGE_FORMAT 0x1110
+#define CL_IMAGE_FORMAT_MISMATCH -9
+#define CL_IMAGE_FORMAT_NOT_SUPPORTED -10
+#define CL_IMAGE_HEIGHT 0x1115
+#define CL_IMAGE_ROW_PITCH 0x1112
+#define CL_IMAGE_SLICE_PITCH 0x1113
+#define CL_IMAGE_WIDTH 0x1114
+#define CL_INFINITY CL_HUGE_VALF
+#define CL_INTENSITY 0x10B8
+#define CL_INT_MAX 2147483647
+#define CL_INT_MIN (-2147483647-1)
+#define CL_INVALID_ARG_INDEX -49
+#define CL_INVALID_ARG_SIZE -51
+#define CL_INVALID_ARG_VALUE -50
+#define CL_INVALID_BINARY -42
+#define CL_INVALID_BUFFER_SIZE -61
+#define CL_INVALID_BUILD_OPTIONS -43
+#define CL_INVALID_COMMAND_QUEUE -36
+#define CL_INVALID_CONTEXT -34
+#define CL_INVALID_DEVICE -33
+#define CL_INVALID_DEVICE_TYPE -31
+#define CL_INVALID_EVENT -58
+#define CL_INVALID_EVENT_WAIT_LIST -57
+#define CL_INVALID_GLOBAL_OFFSET -56
+#define CL_INVALID_GLOBAL_WORK_SIZE -63
+#define CL_INVALID_GL_OBJECT -60
+#define CL_INVALID_HOST_PTR -37
+#define CL_INVALID_IMAGE_FORMAT_DESCRIPTOR -39
+#define CL_INVALID_IMAGE_SIZE -40
+#define CL_INVALID_KERNEL -48
+#define CL_INVALID_KERNEL_ARGS -52
+#define CL_INVALID_KERNEL_DEFINITION -47
+#define CL_INVALID_KERNEL_NAME -46
+#define CL_INVALID_MEM_OBJECT -38
+#define CL_INVALID_MIP_LEVEL -62
+#define CL_INVALID_OPERATION -59
+#define CL_INVALID_PLATFORM -32
+#define CL_INVALID_PROGRAM -44
+#define CL_INVALID_PROGRAM_EXECUTABLE -45
+#define CL_INVALID_QUEUE_PROPERTIES -35
+#define CL_INVALID_SAMPLER -41
+#define CL_INVALID_VALUE -30
+#define CL_INVALID_WORK_DIMENSION -53
+#define CL_INVALID_WORK_GROUP_SIZE -54
+#define CL_INVALID_WORK_ITEM_SIZE -55
+#define CL_KERNEL_COMPILE_WORK_GROUP_SIZE 0x11B1
+#define CL_KERNEL_CONTEXT 0x1193
+#define CL_KERNEL_FUNCTION_NAME 0x1190
+#define CL_KERNEL_LOCAL_MEM_SIZE 0x11B2
+#define CL_KERNEL_NUM_ARGS 0x1191
+#define CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE 0x11B3
+#define CL_KERNEL_PRIVATE_MEM_SIZE 0x11B4
+#define CL_KERNEL_PROGRAM 0x1194
+#define CL_KERNEL_REFERENCE_COUNT 0x1192
+#define CL_KERNEL_WORK_GROUP_SIZE 0x11B0
+#define CL_LOCAL 0x1
+#define CL_LONG_MAX ((cl_long) 0x7FFFFFFFFFFFFFFFLL)
+#define CL_LONG_MIN ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL)
+#define CL_LUMINANCE 0x10B9
+#define CL_MAP_FAILURE -12
+#define CL_MAP_READ (1 << 0)
+#define CL_MAP_WRITE (1 << 1)
+#define CL_MAXFLOAT CL_FLT_MAX
+#define CL_MEM_ALLOC_HOST_PTR (1 << 4)
+#define CL_MEM_CONTEXT 0x1106
+#define CL_MEM_COPY_HOST_PTR (1 << 5)
+#define CL_MEM_COPY_OVERLAP -8
+#define CL_MEM_FLAGS 0x1101
+#define CL_MEM_HOST_PTR 0x1103
+#define CL_MEM_MAP_COUNT 0x1104
+#define CL_MEM_OBJECT_ALLOCATION_FAILURE -4
+#define CL_MEM_OBJECT_BUFFER 0x10F0
+#define CL_MEM_OBJECT_IMAGE2D 0x10F1
+#define CL_MEM_OBJECT_IMAGE3D 0x10F2
+#define CL_MEM_READ_ONLY (1 << 2)
+#define CL_MEM_READ_WRITE (1 << 0)
+#define CL_MEM_REFERENCE_COUNT 0x1105
+#define CL_MEM_SIZE 0x1102
+#define CL_MEM_TYPE 0x1100
+#define CL_MEM_USE_HOST_PTR (1 << 3)
+#define CL_MEM_WRITE_ONLY (1 << 1)
+#define CL_NAN (CL_INFINITY - CL_INFINITY)
+#define CL_NONE 0x0
+#define CL_OUT_OF_HOST_MEMORY -6
+#define CL_OUT_OF_RESOURCES -5
+#define CL_PLATFORM_EXTENSIONS 0x0904
+#define CL_PLATFORM_NAME 0x0902
+#define CL_PLATFORM_PROFILE 0x0900
+#define CL_PLATFORM_VENDOR 0x0903
+#define CL_PLATFORM_VERSION 0x0901
+#define CL_PROFILING_COMMAND_END 0x1283
+#define CL_PROFILING_COMMAND_QUEUED 0x1280
+#define CL_PROFILING_COMMAND_START 0x1282
+#define CL_PROFILING_COMMAND_SUBMIT 0x1281
+#define CL_PROFILING_INFO_NOT_AVAILABLE -7
+#define CL_PROGRAM_BINARIES 0x1166
+#define CL_PROGRAM_BINARY_SIZES 0x1165
+#define CL_PROGRAM_BUILD_LOG 0x1183
+#define CL_PROGRAM_BUILD_OPTIONS 0x1182
+#define CL_PROGRAM_BUILD_STATUS 0x1181
+#define CL_PROGRAM_CONTEXT 0x1161
+#define CL_PROGRAM_DEVICES 0x1163
+#define CL_PROGRAM_NUM_DEVICES 0x1162
+#define CL_PROGRAM_REFERENCE_COUNT 0x1160
+#define CL_PROGRAM_SOURCE 0x1164
+#define CL_QUEUED 0x3
+#define CL_QUEUE_CONTEXT 0x1090
+#define CL_QUEUE_DEVICE 0x1091
+#define CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE (1 << 0)
+#define CL_QUEUE_PROFILING_ENABLE (1 << 1)
+#define CL_QUEUE_PROPERTIES 0x1093
+#define CL_QUEUE_REFERENCE_COUNT 0x1092
+#define CL_R 0x10B0
+#define CL_RA 0x10B3
+#define CL_READ_ONLY_CACHE 0x1
+#define CL_READ_WRITE_CACHE 0x2
+#define CL_RG 0x10B2
+#define CL_RGB 0x10B4
+#define CL_RGBA 0x10B5
+#define CL_RUNNING 0x1
+#define CL_SAMPLER_ADDRESSING_MODE 0x1153
+#define CL_SAMPLER_CONTEXT 0x1151
+#define CL_SAMPLER_FILTER_MODE 0x1154
+#define CL_SAMPLER_NORMALIZED_COORDS 0x1152
+#define CL_SAMPLER_REFERENCE_COUNT 0x1150
+#define CL_SCHAR_MAX 127
+#define CL_SCHAR_MIN (-127-1)
+#define CL_SHRT_MAX 32767
+#define CL_SHRT_MIN (-32767-1)
+#define CL_SIGNED_INT16 0x10D8
+#define CL_SIGNED_INT32 0x10D9
+#define CL_SIGNED_INT8 0x10D7
+#define CL_SNORM_INT16 0x10D1
+#define CL_SNORM_INT8 0x10D0
+#define CL_SUBMITTED 0x2
+#define CL_SUCCESS 0
+#define CL_TRUE 1
+#define CL_UCHAR_MAX 255
+#define CL_UINT_MAX 0xffffffffU
+#define CL_ULONG_MAX ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL)
+#define CL_UNORM_INT16 0x10D3
+#define CL_UNORM_INT8 0x10D2
+#define CL_UNORM_INT_101010 0x10D6
+#define CL_UNORM_SHORT_555 0x10D5
+#define CL_UNORM_SHORT_565 0x10D4
+#define CL_UNSIGNED_INT16 0x10DB
+#define CL_UNSIGNED_INT32 0x10DC
+#define CL_UNSIGNED_INT8 0x10DA
+#define CL_USHRT_MAX 65535
diff --git a/dlls/opencl/pe_thunks.c b/dlls/opencl/pe_thunks.c
index 0b91f885c18..b4a938a034c 100644
--- a/dlls/opencl/pe_thunks.c
+++ b/dlls/opencl/pe_thunks.c
@@ -1,7 +1,8 @@
 /* Automatically generated from OpenCL registry files; DO NOT EDIT! */
 
-#include "config.h"
 #include "opencl_private.h"
+#include "opencl_types.h"
+#include "unixlib.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(opencl);
 
@@ -13,7 +14,7 @@ cl_int WINAPI wine_clBuildProgram( cl_program program, cl_uint num_devices, cons
 
 cl_mem WINAPI wine_clCreateBuffer( cl_context context, cl_mem_flags flags, size_t size, void* host_ptr, cl_int* errcode_ret )
 {
-    TRACE( "(%p, %s, %zu, %p, %p)\n", context, wine_dbgstr_longlong(flags), size, host_ptr, errcode_ret );
+    TRACE( "(%p, %s, %Iu, %p, %p)\n", context, wine_dbgstr_longlong(flags), size, host_ptr, errcode_ret );
     return opencl_funcs->pclCreateBuffer( context, flags, size, host_ptr, errcode_ret );
 }
 
@@ -37,13 +38,13 @@ cl_context WINAPI wine_clCreateContextFromType( const cl_context_properties* pro
 
 cl_mem WINAPI wine_clCreateImage2D( cl_context context, cl_mem_flags flags, const cl_image_format* image_format, size_t image_width, size_t image_height, size_t image_row_pitch, void* host_ptr, cl_int* errcode_ret )
 {
-    TRACE( "(%p, %s, %p, %zu, %zu, %zu, %p, %p)\n", context, wine_dbgstr_longlong(flags), image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret );
+    TRACE( "(%p, %s, %p, %Iu, %Iu, %Iu, %p, %p)\n", context, wine_dbgstr_longlong(flags), image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret );
     return opencl_funcs->pclCreateImage2D( context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret );
 }
 
 cl_mem WINAPI wine_clCreateImage3D( cl_context context, cl_mem_flags flags, const cl_image_format* image_format, size_t image_width, size_t image_height, size_t image_depth, size_t image_row_pitch, size_t image_slice_pitch, void* host_ptr, cl_int* errcode_ret )
 {
-    TRACE( "(%p, %s, %p, %zu, %zu, %zu, %zu, %zu, %p, %p)\n", context, wine_dbgstr_longlong(flags), image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret );
+    TRACE( "(%p, %s, %p, %Iu, %Iu, %Iu, %Iu, %Iu, %p, %p)\n", context, wine_dbgstr_longlong(flags), image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret );
     return opencl_funcs->pclCreateImage3D( context, flags, image_format, image_width, image_height, image_depth, image_row_pitch, image_slice_pitch, host_ptr, errcode_ret );
 }
 
@@ -85,13 +86,13 @@ cl_int WINAPI wine_clEnqueueBarrier( cl_command_queue command_queue )
 
 cl_int WINAPI wine_clEnqueueCopyBuffer( cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_buffer, size_t src_offset, size_t dst_offset, size_t size, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
 {
-    TRACE( "(%p, %p, %p, %zu, %zu, %zu, %u, %p, %p)\n", command_queue, src_buffer, dst_buffer, src_offset, dst_offset, size, num_events_in_wait_list, event_wait_list, event );
+    TRACE( "(%p, %p, %p, %Iu, %Iu, %Iu, %u, %p, %p)\n", command_queue, src_buffer, dst_buffer, src_offset, dst_offset, size, num_events_in_wait_list, event_wait_list, event );
     return opencl_funcs->pclEnqueueCopyBuffer( command_queue, src_buffer, dst_buffer, src_offset, dst_offset, size, num_events_in_wait_list, event_wait_list, event );
 }
 
 cl_int WINAPI wine_clEnqueueCopyBufferToImage( cl_command_queue command_queue, cl_mem src_buffer, cl_mem dst_image, size_t src_offset, const size_t* dst_origin, const size_t* region, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
 {
-    TRACE( "(%p, %p, %p, %zu, %p, %p, %u, %p, %p)\n", command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event );
+    TRACE( "(%p, %p, %p, %Iu, %p, %p, %u, %p, %p)\n", command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event );
     return opencl_funcs->pclEnqueueCopyBufferToImage( command_queue, src_buffer, dst_image, src_offset, dst_origin, region, num_events_in_wait_list, event_wait_list, event );
 }
 
@@ -103,13 +104,13 @@ cl_int WINAPI wine_clEnqueueCopyImage( cl_command_queue command_queue, cl_mem sr
 
 cl_int WINAPI wine_clEnqueueCopyImageToBuffer( cl_command_queue command_queue, cl_mem src_image, cl_mem dst_buffer, const size_t* src_origin, const size_t* region, size_t dst_offset, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
 {
-    TRACE( "(%p, %p, %p, %p, %p, %zu, %u, %p, %p)\n", command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event );
+    TRACE( "(%p, %p, %p, %p, %p, %Iu, %u, %p, %p)\n", command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event );
     return opencl_funcs->pclEnqueueCopyImageToBuffer( command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event );
 }
 
 void* WINAPI wine_clEnqueueMapBuffer( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_map, cl_map_flags map_flags, size_t offset, size_t size, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event, cl_int* errcode_ret )
 {
-    TRACE( "(%p, %p, %u, %s, %zu, %zu, %u, %p, %p, %p)\n", command_queue, buffer, blocking_map, wine_dbgstr_longlong(map_flags), offset, size, num_events_in_wait_list, event_wait_list, event, errcode_ret );
+    TRACE( "(%p, %p, %u, %s, %Iu, %Iu, %u, %p, %p, %p)\n", command_queue, buffer, blocking_map, wine_dbgstr_longlong(map_flags), offset, size, num_events_in_wait_list, event_wait_list, event, errcode_ret );
     return opencl_funcs->pclEnqueueMapBuffer( command_queue, buffer, blocking_map, map_flags, offset, size, num_events_in_wait_list, event_wait_list, event, errcode_ret );
 }
 
@@ -133,19 +134,19 @@ cl_int WINAPI wine_clEnqueueNDRangeKernel( cl_command_queue command_queue, cl_ke
 
 cl_int WINAPI wine_clEnqueueNativeKernel( cl_command_queue command_queue, void (WINAPI* user_func)(void*), void* args, size_t cb_args, cl_uint num_mem_objects, const cl_mem* mem_list, const void** args_mem_loc, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
 {
-    TRACE( "(%p, %p, %p, %zu, %u, %p, %p, %u, %p, %p)\n", command_queue, user_func, args, cb_args, num_mem_objects, mem_list, args_mem_loc, num_events_in_wait_list, event_wait_list, event );
+    TRACE( "(%p, %p, %p, %Iu, %u, %p, %p, %u, %p, %p)\n", command_queue, user_func, args, cb_args, num_mem_objects, mem_list, args_mem_loc, num_events_in_wait_list, event_wait_list, event );
     return opencl_funcs->pclEnqueueNativeKernel( command_queue, user_func, args, cb_args, num_mem_objects, mem_list, args_mem_loc, num_events_in_wait_list, event_wait_list, event );
 }
 
 cl_int WINAPI wine_clEnqueueReadBuffer( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_read, size_t offset, size_t size, void* ptr, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
 {
-    TRACE( "(%p, %p, %u, %zu, %zu, %p, %u, %p, %p)\n", command_queue, buffer, blocking_read, offset, size, ptr, num_events_in_wait_list, event_wait_list, event );
+    TRACE( "(%p, %p, %u, %Iu, %Iu, %p, %u, %p, %p)\n", command_queue, buffer, blocking_read, offset, size, ptr, num_events_in_wait_list, event_wait_list, event );
     return opencl_funcs->pclEnqueueReadBuffer( command_queue, buffer, blocking_read, offset, size, ptr, num_events_in_wait_list, event_wait_list, event );
 }
 
 cl_int WINAPI wine_clEnqueueReadImage( cl_command_queue command_queue, cl_mem image, cl_bool blocking_read, const size_t* origin, const size_t* region, size_t row_pitch, size_t slice_pitch, void* ptr, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
 {
-    TRACE( "(%p, %p, %u, %p, %p, %zu, %zu, %p, %u, %p, %p)\n", command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event );
+    TRACE( "(%p, %p, %u, %p, %p, %Iu, %Iu, %p, %u, %p, %p)\n", command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event );
     return opencl_funcs->pclEnqueueReadImage( command_queue, image, blocking_read, origin, region, row_pitch, slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event );
 }
 
@@ -169,13 +170,13 @@ cl_int WINAPI wine_clEnqueueWaitForEvents( cl_command_queue command_queue, cl_ui
 
 cl_int WINAPI wine_clEnqueueWriteBuffer( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, size_t offset, size_t size, const void* ptr, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
 {
-    TRACE( "(%p, %p, %u, %zu, %zu, %p, %u, %p, %p)\n", command_queue, buffer, blocking_write, offset, size, ptr, num_events_in_wait_list, event_wait_list, event );
+    TRACE( "(%p, %p, %u, %Iu, %Iu, %p, %u, %p, %p)\n", command_queue, buffer, blocking_write, offset, size, ptr, num_events_in_wait_list, event_wait_list, event );
     return opencl_funcs->pclEnqueueWriteBuffer( command_queue, buffer, blocking_write, offset, size, ptr, num_events_in_wait_list, event_wait_list, event );
 }
 
 cl_int WINAPI wine_clEnqueueWriteImage( cl_command_queue command_queue, cl_mem image, cl_bool blocking_write, const size_t* origin, const size_t* region, size_t input_row_pitch, size_t input_slice_pitch, const void* ptr, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
 {
-    TRACE( "(%p, %p, %u, %p, %p, %zu, %zu, %p, %u, %p, %p)\n", command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event );
+    TRACE( "(%p, %p, %u, %p, %p, %Iu, %Iu, %p, %u, %p, %p)\n", command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event );
     return opencl_funcs->pclEnqueueWriteImage( command_queue, image, blocking_write, origin, region, input_row_pitch, input_slice_pitch, ptr, num_events_in_wait_list, event_wait_list, event );
 }
 
@@ -193,13 +194,13 @@ cl_int WINAPI wine_clFlush( cl_command_queue command_queue )
 
 cl_int WINAPI wine_clGetCommandQueueInfo( cl_command_queue command_queue, cl_command_queue_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
 {
-    TRACE( "(%p, %u, %zu, %p, %p)\n", command_queue, param_name, param_value_size, param_value, param_value_size_ret );
+    TRACE( "(%p, %u, %Iu, %p, %p)\n", command_queue, param_name, param_value_size, param_value, param_value_size_ret );
     return opencl_funcs->pclGetCommandQueueInfo( command_queue, param_name, param_value_size, param_value, param_value_size_ret );
 }
 
 cl_int WINAPI wine_clGetContextInfo( cl_context context, cl_context_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
 {
-    TRACE( "(%p, %u, %zu, %p, %p)\n", context, param_name, param_value_size, param_value, param_value_size_ret );
+    TRACE( "(%p, %u, %Iu, %p, %p)\n", context, param_name, param_value_size, param_value, param_value_size_ret );
     return opencl_funcs->pclGetContextInfo( context, param_name, param_value_size, param_value, param_value_size_ret );
 }
 
@@ -211,37 +212,37 @@ cl_int WINAPI wine_clGetDeviceIDs( cl_platform_id platform, cl_device_type devic
 
 cl_int WINAPI wine_clGetEventInfo( cl_event event, cl_event_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
 {
-    TRACE( "(%p, %u, %zu, %p, %p)\n", event, param_name, param_value_size, param_value, param_value_size_ret );
+    TRACE( "(%p, %u, %Iu, %p, %p)\n", event, param_name, param_value_size, param_value, param_value_size_ret );
     return opencl_funcs->pclGetEventInfo( event, param_name, param_value_size, param_value, param_value_size_ret );
 }
 
 cl_int WINAPI wine_clGetEventProfilingInfo( cl_event event, cl_profiling_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
 {
-    TRACE( "(%p, %u, %zu, %p, %p)\n", event, param_name, param_value_size, param_value, param_value_size_ret );
+    TRACE( "(%p, %u, %Iu, %p, %p)\n", event, param_name, param_value_size, param_value, param_value_size_ret );
     return opencl_funcs->pclGetEventProfilingInfo( event, param_name, param_value_size, param_value, param_value_size_ret );
 }
 
 cl_int WINAPI wine_clGetImageInfo( cl_mem image, cl_image_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
 {
-    TRACE( "(%p, %u, %zu, %p, %p)\n", image, param_name, param_value_size, param_value, param_value_size_ret );
+    TRACE( "(%p, %u, %Iu, %p, %p)\n", image, param_name, param_value_size, param_value, param_value_size_ret );
     return opencl_funcs->pclGetImageInfo( image, param_name, param_value_size, param_value, param_value_size_ret );
 }
 
 cl_int WINAPI wine_clGetKernelInfo( cl_kernel kernel, cl_kernel_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
 {
-    TRACE( "(%p, %u, %zu, %p, %p)\n", kernel, param_name, param_value_size, param_value, param_value_size_ret );
+    TRACE( "(%p, %u, %Iu, %p, %p)\n", kernel, param_name, param_value_size, param_value, param_value_size_ret );
     return opencl_funcs->pclGetKernelInfo( kernel, param_name, param_value_size, param_value, param_value_size_ret );
 }
 
 cl_int WINAPI wine_clGetKernelWorkGroupInfo( cl_kernel kernel, cl_device_id device, cl_kernel_work_group_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
 {
-    TRACE( "(%p, %p, %u, %zu, %p, %p)\n", kernel, device, param_name, param_value_size, param_value, param_value_size_ret );
+    TRACE( "(%p, %p, %u, %Iu, %p, %p)\n", kernel, device, param_name, param_value_size, param_value, param_value_size_ret );
     return opencl_funcs->pclGetKernelWorkGroupInfo( kernel, device, param_name, param_value_size, param_value, param_value_size_ret );
 }
 
 cl_int WINAPI wine_clGetMemObjectInfo( cl_mem memobj, cl_mem_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
 {
-    TRACE( "(%p, %u, %zu, %p, %p)\n", memobj, param_name, param_value_size, param_value, param_value_size_ret );
+    TRACE( "(%p, %u, %Iu, %p, %p)\n", memobj, param_name, param_value_size, param_value, param_value_size_ret );
     return opencl_funcs->pclGetMemObjectInfo( memobj, param_name, param_value_size, param_value, param_value_size_ret );
 }
 
@@ -253,19 +254,19 @@ cl_int WINAPI wine_clGetPlatformIDs( cl_uint num_entries, cl_platform_id* platfo
 
 cl_int WINAPI wine_clGetProgramBuildInfo( cl_program program, cl_device_id device, cl_program_build_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
 {
-    TRACE( "(%p, %p, %u, %zu, %p, %p)\n", program, device, param_name, param_value_size, param_value, param_value_size_ret );
+    TRACE( "(%p, %p, %u, %Iu, %p, %p)\n", program, device, param_name, param_value_size, param_value, param_value_size_ret );
     return opencl_funcs->pclGetProgramBuildInfo( program, device, param_name, param_value_size, param_value, param_value_size_ret );
 }
 
 cl_int WINAPI wine_clGetProgramInfo( cl_program program, cl_program_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
 {
-    TRACE( "(%p, %u, %zu, %p, %p)\n", program, param_name, param_value_size, param_value, param_value_size_ret );
+    TRACE( "(%p, %u, %Iu, %p, %p)\n", program, param_name, param_value_size, param_value, param_value_size_ret );
     return opencl_funcs->pclGetProgramInfo( program, param_name, param_value_size, param_value, param_value_size_ret );
 }
 
 cl_int WINAPI wine_clGetSamplerInfo( cl_sampler sampler, cl_sampler_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
 {
-    TRACE( "(%p, %u, %zu, %p, %p)\n", sampler, param_name, param_value_size, param_value, param_value_size_ret );
+    TRACE( "(%p, %u, %Iu, %p, %p)\n", sampler, param_name, param_value_size, param_value, param_value_size_ret );
     return opencl_funcs->pclGetSamplerInfo( sampler, param_name, param_value_size, param_value, param_value_size_ret );
 }
 
@@ -367,7 +368,7 @@ cl_int WINAPI wine_clSetCommandQueueProperty( cl_command_queue command_queue, cl
 
 cl_int WINAPI wine_clSetKernelArg( cl_kernel kernel, cl_uint arg_index, size_t arg_size, const void* arg_value )
 {
-    TRACE( "(%p, %u, %zu, %p)\n", kernel, arg_index, arg_size, arg_value );
+    TRACE( "(%p, %u, %Iu, %p)\n", kernel, arg_index, arg_size, arg_value );
     return opencl_funcs->pclSetKernelArg( kernel, arg_index, arg_size, arg_value );
 }
 
diff --git a/dlls/opencl/pe_wrappers.c b/dlls/opencl/pe_wrappers.c
index c2551e785c7..e84c061c079 100644
--- a/dlls/opencl/pe_wrappers.c
+++ b/dlls/opencl/pe_wrappers.c
@@ -18,8 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
 #include "opencl_private.h"
+#include "opencl_types.h"
+#include "unixlib.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(opencl);
 
diff --git a/dlls/opencl/unix_private.h b/dlls/opencl/unix_private.h
index 2259a87827c..82fb83bd491 100644
--- a/dlls/opencl/unix_private.h
+++ b/dlls/opencl/unix_private.h
@@ -21,6 +21,20 @@
 
 #include "opencl_private.h"
 
+#define CL_SILENCE_DEPRECATION
+#if defined(HAVE_CL_CL_H)
+#define CL_USE_DEPRECATED_OPENCL_1_0_APIS
+#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
+#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
+#define CL_USE_DEPRECATED_OPENCL_2_0_APIS
+#define CL_TARGET_OPENCL_VERSION 220
+#include <CL/cl.h>
+#elif defined(HAVE_OPENCL_OPENCL_H)
+#include <OpenCL/opencl.h>
+#endif
+
+#include "unixlib.h"
+
 cl_int WINAPI wrap_clBuildProgram( cl_program program, cl_uint num_devices,
         const cl_device_id *device_list, const char *options,
         void (WINAPI *pfn_notify)(cl_program program, void *user_data),
-- 
2.20.1




More information about the wine-devel mailing list