[PATCH 4/4] opencl: Update to OpenCL 1.2.
Zebediah Figura
z.figura12 at gmail.com
Sat Mar 20 14:37:38 CDT 2021
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/opencl/make_opencl | 11 +++-
dlls/opencl/opencl.spec | 15 ++++++
dlls/opencl/opencl_types.h | 105 ++++++++++++++++++++++++++++++++++++
dlls/opencl/pe_thunks.c | 84 +++++++++++++++++++++++++++++
dlls/opencl/pe_wrappers.c | 7 +++
dlls/opencl/unix_private.h | 11 ++++
dlls/opencl/unix_thunks.c | 74 +++++++++++++++++++++++++
dlls/opencl/unix_wrappers.c | 20 +++++++
dlls/opencl/unixlib.h | 14 +++++
9 files changed, 340 insertions(+), 1 deletion(-)
diff --git a/dlls/opencl/make_opencl b/dlls/opencl/make_opencl
index 3274d6aa8ca..09eba09914e 100755
--- a/dlls/opencl/make_opencl
+++ b/dlls/opencl/make_opencl
@@ -31,6 +31,7 @@ my $gen_traces = 1;
# List of categories to put in the 'opengl_core.c' file
my %cat_1_0 = ( "CL_VERSION_1_0" => 1 );
my %cat_1_1 = ( %cat_1_0, "CL_VERSION_1_1" => 1 );
+my %cat_1_2 = ( %cat_1_1, "CL_VERSION_1_2" => 1 );
my %core_categories = ();
@@ -184,7 +185,7 @@ if (@ARGV > 1)
$name0 =~ s%^.*/%%;
die "Usage: $name0 [version]\n";
}
-my $version = $ARGV[0] || "1.1";
+my $version = $ARGV[0] || "1.2";
if ($version eq "1.0")
{
%core_categories = %cat_1_0;
@@ -193,6 +194,10 @@ elsif ($version eq "1.1")
{
%core_categories = %cat_1_1;
}
+elsif ($version eq "1.2")
+{
+ %core_categories = %cat_1_2;
+}
else
{
die "Incorrect OpenCL version.\n";
@@ -242,6 +247,7 @@ sub needs_pe_wrapper($)
# needs function pointer conversion
"clGetExtensionFunctionAddress" => 1,
+ "clGetExtensionFunctionAddressForPlatform" => 1,
# deprecated and absent from headers
"clSetCommandQueueProperty" => 1,
@@ -258,9 +264,11 @@ sub needs_unix_wrapper($)
(
# need callback conversion
"clBuildProgram" => 1,
+ "clCompileProgram" => 1,
"clCreateContext" => 1,
"clCreateContextFromType" => 1,
"clEnqueueNativeKernel" => 1,
+ "clLinkProgram" => 1,
"clSetEventCallback" => 1,
"clSetMemObjectDestructorCallback" => 1,
);
@@ -275,6 +283,7 @@ sub needs_unix_function($)
my %funcs =
(
"clGetExtensionFunctionAddress" => 1,
+ "clGetExtensionFunctionAddressForPlatform" => 1,
"clSetCommandQueueProperty" => 1,
);
my $name = shift;
diff --git a/dlls/opencl/opencl.spec b/dlls/opencl/opencl.spec
index 099b9617cd0..2560e82ad5e 100644
--- a/dlls/opencl/opencl.spec
+++ b/dlls/opencl/opencl.spec
@@ -1,26 +1,35 @@
@ stdcall clBuildProgram(ptr long ptr ptr ptr ptr)
+@ stdcall clCompileProgram(ptr long ptr ptr long ptr ptr ptr ptr)
@ stdcall clCreateBuffer(ptr int64 long ptr ptr)
@ stdcall clCreateCommandQueue(ptr ptr int64 ptr)
@ stdcall clCreateContext(ptr long ptr ptr ptr ptr)
@ stdcall clCreateContextFromType(ptr int64 ptr ptr ptr)
+@ stdcall clCreateImage(ptr int64 ptr ptr ptr ptr)
@ stdcall clCreateImage2D(ptr int64 ptr long long long ptr ptr)
@ stdcall clCreateImage3D(ptr int64 ptr long long long long long ptr ptr)
@ stdcall clCreateKernel(ptr ptr ptr)
@ stdcall clCreateKernelsInProgram(ptr long ptr ptr)
@ stdcall clCreateProgramWithBinary(ptr long ptr ptr ptr ptr ptr)
+@ stdcall clCreateProgramWithBuiltInKernels(ptr long ptr ptr ptr)
@ stdcall clCreateProgramWithSource(ptr long ptr ptr ptr)
@ stdcall clCreateSampler(ptr long long long ptr)
@ stdcall clCreateSubBuffer(ptr int64 long ptr ptr)
+@ stdcall clCreateSubDevices(ptr ptr long ptr ptr)
@ stdcall clCreateUserEvent(ptr ptr)
@ stdcall clEnqueueBarrier(ptr)
+@ stdcall clEnqueueBarrierWithWaitList(ptr long ptr ptr)
@ stdcall clEnqueueCopyBuffer(ptr ptr ptr long long long long ptr ptr)
@ stdcall clEnqueueCopyBufferRect(ptr ptr ptr ptr ptr ptr long long long long long ptr ptr)
@ stdcall clEnqueueCopyBufferToImage(ptr ptr ptr long ptr ptr long ptr ptr)
@ stdcall clEnqueueCopyImage(ptr ptr ptr ptr ptr ptr long ptr ptr)
@ stdcall clEnqueueCopyImageToBuffer(ptr ptr ptr ptr ptr long long ptr ptr)
+@ stdcall clEnqueueFillBuffer(ptr ptr ptr long long long long ptr ptr)
+@ stdcall clEnqueueFillImage(ptr ptr ptr ptr ptr long ptr ptr)
@ stdcall clEnqueueMapBuffer(ptr ptr long int64 long long long ptr ptr ptr)
@ stdcall clEnqueueMapImage(ptr ptr long int64 ptr ptr ptr ptr long ptr ptr ptr)
@ stdcall clEnqueueMarker(ptr ptr)
+@ stdcall clEnqueueMarkerWithWaitList(ptr long ptr ptr)
+@ stdcall clEnqueueMigrateMemObjects(ptr long ptr int64 long ptr ptr)
@ stdcall clEnqueueNDRangeKernel(ptr ptr long ptr ptr ptr long ptr ptr)
@ stdcall clEnqueueNativeKernel(ptr ptr ptr long long ptr ptr long ptr ptr)
@ stdcall clEnqueueReadBuffer(ptr ptr long long long ptr long ptr ptr)
@@ -41,7 +50,9 @@
@ stdcall clGetEventInfo(ptr long long ptr ptr)
@ stdcall clGetEventProfilingInfo(ptr long long ptr ptr)
@ stdcall clGetExtensionFunctionAddress(ptr)
+@ stdcall clGetExtensionFunctionAddressForPlatform(ptr ptr)
@ stdcall clGetImageInfo(ptr long long ptr ptr)
+@ stdcall clGetKernelArgInfo(ptr long long long ptr ptr)
@ stdcall clGetKernelInfo(ptr long long ptr ptr)
@ stdcall clGetKernelWorkGroupInfo(ptr ptr long long ptr ptr)
@ stdcall clGetMemObjectInfo(ptr long long ptr ptr)
@@ -51,8 +62,10 @@
@ stdcall clGetProgramInfo(ptr long long ptr ptr)
@ stdcall clGetSamplerInfo(ptr long long ptr ptr)
@ stdcall clGetSupportedImageFormats(ptr int64 long long ptr ptr)
+@ stdcall clLinkProgram(ptr long ptr ptr long ptr ptr ptr ptr)
@ stdcall clReleaseCommandQueue(ptr)
@ stdcall clReleaseContext(ptr)
+@ stdcall clReleaseDevice(ptr)
@ stdcall clReleaseEvent(ptr)
@ stdcall clReleaseKernel(ptr)
@ stdcall clReleaseMemObject(ptr)
@@ -60,6 +73,7 @@
@ stdcall clReleaseSampler(ptr)
@ stdcall clRetainCommandQueue(ptr)
@ stdcall clRetainContext(ptr)
+@ stdcall clRetainDevice(ptr)
@ stdcall clRetainEvent(ptr)
@ stdcall clRetainKernel(ptr)
@ stdcall clRetainMemObject(ptr)
@@ -71,4 +85,5 @@
@ stdcall clSetMemObjectDestructorCallback(ptr ptr ptr)
@ stdcall clSetUserEventStatus(ptr long)
@ stdcall clUnloadCompiler()
+@ stdcall clUnloadPlatformCompiler(ptr)
@ stdcall clWaitForEvents(long ptr)
diff --git a/dlls/opencl/opencl_types.h b/dlls/opencl/opencl_types.h
index 5d10b2c9ee1..6d6dc0d870c 100644
--- a/dlls/opencl/opencl_types.h
+++ b/dlls/opencl/opencl_types.h
@@ -55,6 +55,30 @@ typedef struct _cl_buffer_region
size_t size;
} cl_buffer_region;
typedef cl_uint cl_buffer_create_type;
+typedef intptr_t cl_device_partition_property;
+typedef cl_bitfield cl_device_affinity_domain;
+typedef cl_bitfield cl_mem_migration_flags;
+typedef cl_uint cl_program_binary_type;
+typedef cl_uint cl_kernel_arg_info;
+typedef cl_uint cl_kernel_arg_address_qualifier;
+typedef cl_uint cl_kernel_arg_access_qualifier;
+typedef cl_bitfield cl_kernel_arg_type_qualifier;
+typedef struct _cl_image_desc
+{
+ cl_mem_object_type image_type;
+ size_t image_width;
+ size_t image_height;
+ size_t image_depth;
+ size_t image_array_size;
+ size_t image_row_pitch;
+ size_t image_slice_pitch;
+ cl_uint num_mip_levels;
+ cl_uint num_samples;
+ union {
+ cl_mem buffer;
+ cl_mem mem_object;
+ };
+} cl_image_desc;
#define CL_A 0x10B1
#define CL_ADDRESS_CLAMP 0x1132
@@ -64,6 +88,7 @@ typedef cl_uint cl_buffer_create_type;
#define CL_ADDRESS_REPEAT 0x1133
#define CL_ARGB 0x10B7
#define CL_BGRA 0x10B6
+#define CL_BLOCKING CL_TRUE
#define CL_BUFFER_CREATE_TYPE_REGION 0x1220
#define CL_BUILD_ERROR -2
#define CL_BUILD_IN_PROGRESS -3
@@ -74,14 +99,18 @@ typedef cl_uint cl_buffer_create_type;
#define CL_CHAR_MAX CL_SCHAR_MAX
#define CL_CHAR_MIN CL_SCHAR_MIN
#define CL_COMMAND_ACQUIRE_GL_OBJECTS 0x11FF
+#define CL_COMMAND_BARRIER 0x1205
#define CL_COMMAND_COPY_BUFFER 0x11F5
#define CL_COMMAND_COPY_BUFFER_RECT 0x1203
#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_FILL_BUFFER 0x1207
+#define CL_COMMAND_FILL_IMAGE 0x1208
#define CL_COMMAND_MAP_BUFFER 0x11FB
#define CL_COMMAND_MAP_IMAGE 0x11FC
#define CL_COMMAND_MARKER 0x11FE
+#define CL_COMMAND_MIGRATE_MEM_OBJECTS 0x1206
#define CL_COMMAND_NATIVE_KERNEL 0x11F2
#define CL_COMMAND_NDRANGE_KERNEL 0x11F0
#define CL_COMMAND_READ_BUFFER 0x11F3
@@ -95,8 +124,10 @@ typedef cl_uint cl_buffer_create_type;
#define CL_COMMAND_WRITE_BUFFER_RECT 0x1202
#define CL_COMMAND_WRITE_IMAGE 0x11F7
#define CL_COMPILER_NOT_AVAILABLE -3
+#define CL_COMPILE_PROGRAM_FAILURE -15
#define CL_COMPLETE 0x0
#define CL_CONTEXT_DEVICES 0x1081
+#define CL_CONTEXT_INTEROP_USER_SYNC 0x1085
#define CL_CONTEXT_NUM_DEVICES 0x1083
#define CL_CONTEXT_PLATFORM 0x1084
#define CL_CONTEXT_PROPERTIES 0x1082
@@ -112,8 +143,16 @@ typedef cl_uint cl_buffer_create_type;
#define CL_DBL_MIN_EXP -1021
#define CL_DBL_RADIX 2
#define CL_DEVICE_ADDRESS_BITS 0x100D
+#define CL_DEVICE_AFFINITY_DOMAIN_L1_CACHE (1 << 4)
+#define CL_DEVICE_AFFINITY_DOMAIN_L2_CACHE (1 << 3)
+#define CL_DEVICE_AFFINITY_DOMAIN_L3_CACHE (1 << 2)
+#define CL_DEVICE_AFFINITY_DOMAIN_L4_CACHE (1 << 1)
+#define CL_DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE (1 << 5)
+#define CL_DEVICE_AFFINITY_DOMAIN_NUMA (1 << 0)
#define CL_DEVICE_AVAILABLE 0x1027
+#define CL_DEVICE_BUILT_IN_KERNELS 0x103F
#define CL_DEVICE_COMPILER_AVAILABLE 0x1028
+#define CL_DEVICE_DOUBLE_FP_CONFIG 0x1032
#define CL_DEVICE_ENDIAN_LITTLE 0x1026
#define CL_DEVICE_ERROR_CORRECTION_SUPPORT 0x1024
#define CL_DEVICE_EXECUTION_CAPABILITIES 0x1029
@@ -128,7 +167,10 @@ typedef cl_uint cl_buffer_create_type;
#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_MAX_ARRAY_SIZE 0x1041
+#define CL_DEVICE_IMAGE_MAX_BUFFER_SIZE 0x1040
#define CL_DEVICE_IMAGE_SUPPORT 0x1016
+#define CL_DEVICE_LINKER_AVAILABLE 0x103E
#define CL_DEVICE_LOCAL_MEM_SIZE 0x1023
#define CL_DEVICE_LOCAL_MEM_TYPE 0x1022
#define CL_DEVICE_MAX_CLOCK_FREQUENCY 0x100C
@@ -156,7 +198,18 @@ typedef cl_uint cl_buffer_create_type;
#define CL_DEVICE_NOT_AVAILABLE -2
#define CL_DEVICE_NOT_FOUND -1
#define CL_DEVICE_OPENCL_C_VERSION 0x103D
+#define CL_DEVICE_PARENT_DEVICE 0x1042
+#define CL_DEVICE_PARTITION_AFFINITY_DOMAIN 0x1045
+#define CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN 0x1088
+#define CL_DEVICE_PARTITION_BY_COUNTS 0x1087
+#define CL_DEVICE_PARTITION_BY_COUNTS_LIST_END 0x0
+#define CL_DEVICE_PARTITION_EQUALLY 0x1086
+#define CL_DEVICE_PARTITION_FAILED -18
+#define CL_DEVICE_PARTITION_MAX_SUB_DEVICES 0x1043
+#define CL_DEVICE_PARTITION_PROPERTIES 0x1044
+#define CL_DEVICE_PARTITION_TYPE 0x1046
#define CL_DEVICE_PLATFORM 0x1031
+#define CL_DEVICE_PREFERRED_INTEROP_USER_SYNC 0x1048
#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR 0x1006
#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE 0x100B
#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT 0x100A
@@ -164,14 +217,17 @@ typedef cl_uint cl_buffer_create_type;
#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_PRINTF_BUFFER_SIZE 0x1049
#define CL_DEVICE_PROFILE 0x102E
#define CL_DEVICE_PROFILING_TIMER_RESOLUTION 0x1025
#define CL_DEVICE_QUEUE_PROPERTIES 0x102A
+#define CL_DEVICE_REFERENCE_COUNT 0x1047
#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_CUSTOM (1 << 4)
#define CL_DEVICE_TYPE_DEFAULT (1 << 0)
#define CL_DEVICE_TYPE_GPU (1 << 2)
#define CL_DEVICE_VENDOR 0x102C
@@ -200,6 +256,7 @@ typedef cl_uint cl_buffer_create_type;
#define CL_FLT_MIN_10_EXP -37
#define CL_FLT_MIN_EXP -125
#define CL_FLT_RADIX 2
+#define CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT (1 << 7)
#define CL_FP_DENORM (1 << 0)
#define CL_FP_FMA (1 << 5)
#define CL_FP_INF_NAN (1 << 1)
@@ -211,12 +268,16 @@ typedef cl_uint cl_buffer_create_type;
#define CL_HALF_FLOAT 0x10DD
#define CL_HUGE_VAL ((cl_double) 1e500)
#define CL_HUGE_VALF ((cl_float) 1e50)
+#define CL_IMAGE_ARRAY_SIZE 0x1117
+#define CL_IMAGE_BUFFER 0x1118
#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_NUM_MIP_LEVELS 0x1119
+#define CL_IMAGE_NUM_SAMPLES 0x111A
#define CL_IMAGE_ROW_PITCH 0x1112
#define CL_IMAGE_SLICE_PITCH 0x1113
#define CL_IMAGE_WIDTH 0x1114
@@ -231,8 +292,10 @@ typedef cl_uint cl_buffer_create_type;
#define CL_INVALID_BUFFER_SIZE -61
#define CL_INVALID_BUILD_OPTIONS -43
#define CL_INVALID_COMMAND_QUEUE -36
+#define CL_INVALID_COMPILER_OPTIONS -66
#define CL_INVALID_CONTEXT -34
#define CL_INVALID_DEVICE -33
+#define CL_INVALID_DEVICE_PARTITION_COUNT -68
#define CL_INVALID_DEVICE_TYPE -31
#define CL_INVALID_EVENT -58
#define CL_INVALID_EVENT_WAIT_LIST -57
@@ -240,12 +303,14 @@ typedef cl_uint cl_buffer_create_type;
#define CL_INVALID_GLOBAL_WORK_SIZE -63
#define CL_INVALID_GL_OBJECT -60
#define CL_INVALID_HOST_PTR -37
+#define CL_INVALID_IMAGE_DESCRIPTOR -65
#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_LINKER_OPTIONS -67
#define CL_INVALID_MEM_OBJECT -38
#define CL_INVALID_MIP_LEVEL -62
#define CL_INVALID_OPERATION -59
@@ -259,9 +324,29 @@ typedef cl_uint cl_buffer_create_type;
#define CL_INVALID_WORK_DIMENSION -53
#define CL_INVALID_WORK_GROUP_SIZE -54
#define CL_INVALID_WORK_ITEM_SIZE -55
+#define CL_KERNEL_ARG_ACCESS_NONE 0x11A3
+#define CL_KERNEL_ARG_ACCESS_QUALIFIER 0x1197
+#define CL_KERNEL_ARG_ACCESS_READ_ONLY 0x11A0
+#define CL_KERNEL_ARG_ACCESS_READ_WRITE 0x11A2
+#define CL_KERNEL_ARG_ACCESS_WRITE_ONLY 0x11A1
+#define CL_KERNEL_ARG_ADDRESS_CONSTANT 0x119D
+#define CL_KERNEL_ARG_ADDRESS_GLOBAL 0x119B
+#define CL_KERNEL_ARG_ADDRESS_LOCAL 0x119C
+#define CL_KERNEL_ARG_ADDRESS_PRIVATE 0x119E
+#define CL_KERNEL_ARG_ADDRESS_QUALIFIER 0x1196
+#define CL_KERNEL_ARG_INFO_NOT_AVAILABLE -19
+#define CL_KERNEL_ARG_NAME 0x119A
+#define CL_KERNEL_ARG_TYPE_CONST (1 << 0)
+#define CL_KERNEL_ARG_TYPE_NAME 0x1198
+#define CL_KERNEL_ARG_TYPE_NONE 0
+#define CL_KERNEL_ARG_TYPE_QUALIFIER 0x1199
+#define CL_KERNEL_ARG_TYPE_RESTRICT (1 << 1)
+#define CL_KERNEL_ARG_TYPE_VOLATILE (1 << 2)
+#define CL_KERNEL_ATTRIBUTES 0x1195
#define CL_KERNEL_COMPILE_WORK_GROUP_SIZE 0x11B1
#define CL_KERNEL_CONTEXT 0x1193
#define CL_KERNEL_FUNCTION_NAME 0x1190
+#define CL_KERNEL_GLOBAL_WORK_SIZE 0x11B5
#define CL_KERNEL_LOCAL_MEM_SIZE 0x11B2
#define CL_KERNEL_NUM_ARGS 0x1191
#define CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE 0x11B3
@@ -269,6 +354,8 @@ typedef cl_uint cl_buffer_create_type;
#define CL_KERNEL_PROGRAM 0x1194
#define CL_KERNEL_REFERENCE_COUNT 0x1192
#define CL_KERNEL_WORK_GROUP_SIZE 0x11B0
+#define CL_LINKER_NOT_AVAILABLE -16
+#define CL_LINK_PROGRAM_FAILURE -17
#define CL_LOCAL 0x1
#define CL_LONG_MAX ((cl_long) 0x7FFFFFFFFFFFFFFFLL)
#define CL_LONG_MIN ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL)
@@ -276,6 +363,7 @@ typedef cl_uint cl_buffer_create_type;
#define CL_MAP_FAILURE -12
#define CL_MAP_READ (1 << 0)
#define CL_MAP_WRITE (1 << 1)
+#define CL_MAP_WRITE_INVALIDATE_REGION (1 << 2)
#define CL_MAXFLOAT CL_FLT_MAX
#define CL_MEM_ALLOC_HOST_PTR (1 << 4)
#define CL_MEM_ASSOCIATED_MEMOBJECT 0x1107
@@ -283,11 +371,18 @@ typedef cl_uint cl_buffer_create_type;
#define CL_MEM_COPY_HOST_PTR (1 << 5)
#define CL_MEM_COPY_OVERLAP -8
#define CL_MEM_FLAGS 0x1101
+#define CL_MEM_HOST_NO_ACCESS (1 << 9)
#define CL_MEM_HOST_PTR 0x1103
+#define CL_MEM_HOST_READ_ONLY (1 << 8)
+#define CL_MEM_HOST_WRITE_ONLY (1 << 7)
#define CL_MEM_MAP_COUNT 0x1104
#define CL_MEM_OBJECT_ALLOCATION_FAILURE -4
#define CL_MEM_OBJECT_BUFFER 0x10F0
+#define CL_MEM_OBJECT_IMAGE1D 0x10F4
+#define CL_MEM_OBJECT_IMAGE1D_ARRAY 0x10F5
+#define CL_MEM_OBJECT_IMAGE1D_BUFFER 0x10F6
#define CL_MEM_OBJECT_IMAGE2D 0x10F1
+#define CL_MEM_OBJECT_IMAGE2D_ARRAY 0x10F3
#define CL_MEM_OBJECT_IMAGE3D 0x10F2
#define CL_MEM_OFFSET 0x1108
#define CL_MEM_READ_ONLY (1 << 2)
@@ -297,9 +392,12 @@ typedef cl_uint cl_buffer_create_type;
#define CL_MEM_TYPE 0x1100
#define CL_MEM_USE_HOST_PTR (1 << 3)
#define CL_MEM_WRITE_ONLY (1 << 1)
+#define CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED (1 << 1)
+#define CL_MIGRATE_MEM_OBJECT_HOST (1 << 0)
#define CL_MISALIGNED_SUB_BUFFER_OFFSET -13
#define CL_NAN (CL_INFINITY - CL_INFINITY)
#define CL_NONE 0x0
+#define CL_NON_BLOCKING CL_FALSE
#define CL_OUT_OF_HOST_MEMORY -6
#define CL_OUT_OF_RESOURCES -5
#define CL_PLATFORM_EXTENSIONS 0x0904
@@ -314,12 +412,19 @@ typedef cl_uint cl_buffer_create_type;
#define CL_PROFILING_INFO_NOT_AVAILABLE -7
#define CL_PROGRAM_BINARIES 0x1166
#define CL_PROGRAM_BINARY_SIZES 0x1165
+#define CL_PROGRAM_BINARY_TYPE 0x1184
+#define CL_PROGRAM_BINARY_TYPE_COMPILED_OBJECT 0x1
+#define CL_PROGRAM_BINARY_TYPE_EXECUTABLE 0x4
+#define CL_PROGRAM_BINARY_TYPE_LIBRARY 0x2
+#define CL_PROGRAM_BINARY_TYPE_NONE 0x0
#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_KERNEL_NAMES 0x1168
#define CL_PROGRAM_NUM_DEVICES 0x1162
+#define CL_PROGRAM_NUM_KERNELS 0x1167
#define CL_PROGRAM_REFERENCE_COUNT 0x1160
#define CL_PROGRAM_SOURCE 0x1164
#define CL_QUEUED 0x3
diff --git a/dlls/opencl/pe_thunks.c b/dlls/opencl/pe_thunks.c
index 74204aeb95c..4edc379cbe7 100644
--- a/dlls/opencl/pe_thunks.c
+++ b/dlls/opencl/pe_thunks.c
@@ -12,6 +12,12 @@ cl_int WINAPI clBuildProgram( cl_program program, cl_uint num_devices, const cl_
return opencl_funcs->pclBuildProgram( program, num_devices, device_list, options, pfn_notify, user_data );
}
+cl_int WINAPI clCompileProgram( cl_program program, cl_uint num_devices, const cl_device_id* device_list, const char* options, cl_uint num_input_headers, const cl_program* input_headers, const char** header_include_names, void (WINAPI* pfn_notify)(cl_program program, void* user_data), void* user_data )
+{
+ TRACE( "(%p, %u, %p, %p, %u, %p, %p, %p, %p)\n", program, num_devices, device_list, options, num_input_headers, input_headers, header_include_names, pfn_notify, user_data );
+ return opencl_funcs->pclCompileProgram( program, num_devices, device_list, options, num_input_headers, input_headers, header_include_names, pfn_notify, user_data );
+}
+
cl_mem WINAPI clCreateBuffer( cl_context context, cl_mem_flags flags, size_t size, void* host_ptr, cl_int* errcode_ret )
{
TRACE( "(%p, %s, %Iu, %p, %p)\n", context, wine_dbgstr_longlong(flags), size, host_ptr, errcode_ret );
@@ -36,6 +42,12 @@ cl_context WINAPI clCreateContextFromType( const cl_context_properties* properti
return opencl_funcs->pclCreateContextFromType( properties, device_type, pfn_notify, user_data, errcode_ret );
}
+cl_mem WINAPI clCreateImage( cl_context context, cl_mem_flags flags, const cl_image_format* image_format, const cl_image_desc* image_desc, void* host_ptr, cl_int* errcode_ret )
+{
+ TRACE( "(%p, %s, %p, %p, %p, %p)\n", context, wine_dbgstr_longlong(flags), image_format, image_desc, host_ptr, errcode_ret );
+ return opencl_funcs->pclCreateImage( context, flags, image_format, image_desc, host_ptr, errcode_ret );
+}
+
cl_mem WINAPI 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, %Iu, %Iu, %Iu, %p, %p)\n", context, wine_dbgstr_longlong(flags), image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret );
@@ -66,6 +78,12 @@ cl_program WINAPI clCreateProgramWithBinary( cl_context context, cl_uint num_dev
return opencl_funcs->pclCreateProgramWithBinary( context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret );
}
+cl_program WINAPI clCreateProgramWithBuiltInKernels( cl_context context, cl_uint num_devices, const cl_device_id* device_list, const char* kernel_names, cl_int* errcode_ret )
+{
+ TRACE( "(%p, %u, %p, %p, %p)\n", context, num_devices, device_list, kernel_names, errcode_ret );
+ return opencl_funcs->pclCreateProgramWithBuiltInKernels( context, num_devices, device_list, kernel_names, errcode_ret );
+}
+
cl_program WINAPI clCreateProgramWithSource( cl_context context, cl_uint count, const char** strings, const size_t* lengths, cl_int* errcode_ret )
{
TRACE( "(%p, %u, %p, %p, %p)\n", context, count, strings, lengths, errcode_ret );
@@ -84,6 +102,12 @@ cl_mem WINAPI clCreateSubBuffer( cl_mem buffer, cl_mem_flags flags, cl_buffer_cr
return opencl_funcs->pclCreateSubBuffer( buffer, flags, buffer_create_type, buffer_create_info, errcode_ret );
}
+cl_int WINAPI clCreateSubDevices( cl_device_id in_device, const cl_device_partition_property* properties, cl_uint num_devices, cl_device_id* out_devices, cl_uint* num_devices_ret )
+{
+ TRACE( "(%p, %p, %u, %p, %p)\n", in_device, properties, num_devices, out_devices, num_devices_ret );
+ return opencl_funcs->pclCreateSubDevices( in_device, properties, num_devices, out_devices, num_devices_ret );
+}
+
cl_event WINAPI clCreateUserEvent( cl_context context, cl_int* errcode_ret )
{
TRACE( "(%p, %p)\n", context, errcode_ret );
@@ -96,6 +120,12 @@ cl_int WINAPI clEnqueueBarrier( cl_command_queue command_queue )
return opencl_funcs->pclEnqueueBarrier( command_queue );
}
+cl_int WINAPI clEnqueueBarrierWithWaitList( cl_command_queue command_queue, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
+{
+ TRACE( "(%p, %u, %p, %p)\n", command_queue, num_events_in_wait_list, event_wait_list, event );
+ return opencl_funcs->pclEnqueueBarrierWithWaitList( command_queue, num_events_in_wait_list, event_wait_list, event );
+}
+
cl_int WINAPI 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, %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 );
@@ -126,6 +156,18 @@ cl_int WINAPI clEnqueueCopyImageToBuffer( cl_command_queue command_queue, cl_mem
return opencl_funcs->pclEnqueueCopyImageToBuffer( command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event );
}
+cl_int WINAPI clEnqueueFillBuffer( cl_command_queue command_queue, cl_mem buffer, const void* pattern, size_t pattern_size, size_t offset, size_t size, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
+{
+ TRACE( "(%p, %p, %p, %Iu, %Iu, %Iu, %u, %p, %p)\n", command_queue, buffer, pattern, pattern_size, offset, size, num_events_in_wait_list, event_wait_list, event );
+ return opencl_funcs->pclEnqueueFillBuffer( command_queue, buffer, pattern, pattern_size, offset, size, num_events_in_wait_list, event_wait_list, event );
+}
+
+cl_int WINAPI clEnqueueFillImage( cl_command_queue command_queue, cl_mem image, const void* fill_color, const size_t* 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, %p, %p, %u, %p, %p)\n", command_queue, image, fill_color, origin, region, num_events_in_wait_list, event_wait_list, event );
+ return opencl_funcs->pclEnqueueFillImage( command_queue, image, fill_color, origin, region, num_events_in_wait_list, event_wait_list, event );
+}
+
void* WINAPI 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, %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 );
@@ -144,6 +186,18 @@ cl_int WINAPI clEnqueueMarker( cl_command_queue command_queue, cl_event* event )
return opencl_funcs->pclEnqueueMarker( command_queue, event );
}
+cl_int WINAPI clEnqueueMarkerWithWaitList( cl_command_queue command_queue, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
+{
+ TRACE( "(%p, %u, %p, %p)\n", command_queue, num_events_in_wait_list, event_wait_list, event );
+ return opencl_funcs->pclEnqueueMarkerWithWaitList( command_queue, num_events_in_wait_list, event_wait_list, event );
+}
+
+cl_int WINAPI clEnqueueMigrateMemObjects( cl_command_queue command_queue, cl_uint num_mem_objects, const cl_mem* mem_objects, cl_mem_migration_flags flags, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
+{
+ TRACE( "(%p, %u, %p, %s, %u, %p, %p)\n", command_queue, num_mem_objects, mem_objects, wine_dbgstr_longlong(flags), num_events_in_wait_list, event_wait_list, event );
+ return opencl_funcs->pclEnqueueMigrateMemObjects( command_queue, num_mem_objects, mem_objects, flags, num_events_in_wait_list, event_wait_list, event );
+}
+
cl_int WINAPI clEnqueueNDRangeKernel( cl_command_queue command_queue, 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_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
{
TRACE( "(%p, %p, %u, %p, %p, %p, %u, %p, %p)\n", command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event );
@@ -258,6 +312,12 @@ cl_int WINAPI clGetImageInfo( cl_mem image, cl_image_info param_name, size_t par
return opencl_funcs->pclGetImageInfo( image, param_name, param_value_size, param_value, param_value_size_ret );
}
+cl_int WINAPI clGetKernelArgInfo( cl_kernel kernel, cl_uint arg_index, cl_kernel_arg_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
+{
+ TRACE( "(%p, %u, %u, %Iu, %p, %p)\n", kernel, arg_index, param_name, param_value_size, param_value, param_value_size_ret );
+ return opencl_funcs->pclGetKernelArgInfo( kernel, arg_index, param_name, param_value_size, param_value, param_value_size_ret );
+}
+
cl_int WINAPI 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, %Iu, %p, %p)\n", kernel, param_name, param_value_size, param_value, param_value_size_ret );
@@ -306,6 +366,12 @@ cl_int WINAPI clGetSupportedImageFormats( cl_context context, cl_mem_flags flags
return opencl_funcs->pclGetSupportedImageFormats( context, flags, image_type, num_entries, image_formats, num_image_formats );
}
+cl_program WINAPI clLinkProgram( cl_context context, cl_uint num_devices, const cl_device_id* device_list, const char* options, cl_uint num_input_programs, const cl_program* input_programs, void (WINAPI* pfn_notify)(cl_program program, void* user_data), void* user_data, cl_int* errcode_ret )
+{
+ TRACE( "(%p, %u, %p, %p, %u, %p, %p, %p, %p)\n", context, num_devices, device_list, options, num_input_programs, input_programs, pfn_notify, user_data, errcode_ret );
+ return opencl_funcs->pclLinkProgram( context, num_devices, device_list, options, num_input_programs, input_programs, pfn_notify, user_data, errcode_ret );
+}
+
cl_int WINAPI clReleaseCommandQueue( cl_command_queue command_queue )
{
TRACE( "(%p)\n", command_queue );
@@ -318,6 +384,12 @@ cl_int WINAPI clReleaseContext( cl_context context )
return opencl_funcs->pclReleaseContext( context );
}
+cl_int WINAPI clReleaseDevice( cl_device_id device )
+{
+ TRACE( "(%p)\n", device );
+ return opencl_funcs->pclReleaseDevice( device );
+}
+
cl_int WINAPI clReleaseEvent( cl_event event )
{
TRACE( "(%p)\n", event );
@@ -360,6 +432,12 @@ cl_int WINAPI clRetainContext( cl_context context )
return opencl_funcs->pclRetainContext( context );
}
+cl_int WINAPI clRetainDevice( cl_device_id device )
+{
+ TRACE( "(%p)\n", device );
+ return opencl_funcs->pclRetainDevice( device );
+}
+
cl_int WINAPI clRetainEvent( cl_event event )
{
TRACE( "(%p)\n", event );
@@ -420,6 +498,12 @@ cl_int WINAPI clUnloadCompiler( void )
return opencl_funcs->pclUnloadCompiler();
}
+cl_int WINAPI clUnloadPlatformCompiler( cl_platform_id platform )
+{
+ TRACE( "(%p)\n", platform );
+ return opencl_funcs->pclUnloadPlatformCompiler( platform );
+}
+
cl_int WINAPI clWaitForEvents( cl_uint num_events, const cl_event* event_list )
{
TRACE( "(%u, %p)\n", num_events, event_list );
diff --git a/dlls/opencl/pe_wrappers.c b/dlls/opencl/pe_wrappers.c
index a91797e8ac0..b2ce4fbd81a 100644
--- a/dlls/opencl/pe_wrappers.c
+++ b/dlls/opencl/pe_wrappers.c
@@ -185,6 +185,13 @@ cl_int WINAPI clSetCommandQueueProperty( cl_command_queue command_queue, cl_comm
}
+void * WINAPI clGetExtensionFunctionAddressForPlatform( cl_platform_id platform, const char *func_name )
+{
+ FIXME( "(%p, %s) stub!\n", platform, debugstr_a(func_name) );
+ return NULL;
+}
+
+
BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved )
{
if (reason == DLL_PROCESS_ATTACH)
diff --git a/dlls/opencl/unix_private.h b/dlls/opencl/unix_private.h
index 324df387169..d139f144b76 100644
--- a/dlls/opencl/unix_private.h
+++ b/dlls/opencl/unix_private.h
@@ -71,6 +71,17 @@ cl_int WINAPI wrap_clSetMemObjectDestructorCallback(cl_mem memobj,
void (WINAPI *pfn_notify)(cl_mem, void *),
void *user_data) DECLSPEC_HIDDEN;
+cl_int WINAPI wrap_clCompileProgram( cl_program program, cl_uint num_devices,
+ const cl_device_id *device_list, const char *options, cl_uint num_input_headers,
+ const cl_program *input_headers, const char **header_include_names,
+ void (WINAPI *pfn_notify)(cl_program program, void *user_data),
+ void *user_data ) DECLSPEC_HIDDEN;
+
+cl_program WINAPI wrap_clLinkProgram( cl_context context, cl_uint num_devices, const cl_device_id *device_list,
+ const char *options, cl_uint num_input_programs, const cl_program *input_programs,
+ void (WINAPI *pfn_notify)(cl_program program, void *user_data),
+ void *user_data, cl_int *errcode_ret ) DECLSPEC_HIDDEN;
+
extern const struct opencl_funcs funcs;
#endif
diff --git a/dlls/opencl/unix_thunks.c b/dlls/opencl/unix_thunks.c
index 656d4787fb2..726f81bceb4 100644
--- a/dlls/opencl/unix_thunks.c
+++ b/dlls/opencl/unix_thunks.c
@@ -17,6 +17,11 @@ static cl_command_queue WINAPI wrap_clCreateCommandQueue( cl_context context, cl
return clCreateCommandQueue( context, device, properties, errcode_ret );
}
+static cl_mem WINAPI wrap_clCreateImage( cl_context context, cl_mem_flags flags, const cl_image_format* image_format, const cl_image_desc* image_desc, void* host_ptr, cl_int* errcode_ret )
+{
+ return clCreateImage( context, flags, image_format, image_desc, host_ptr, errcode_ret );
+}
+
static cl_mem WINAPI wrap_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 )
{
return clCreateImage2D( context, flags, image_format, image_width, image_height, image_row_pitch, host_ptr, errcode_ret );
@@ -42,6 +47,11 @@ static cl_program WINAPI wrap_clCreateProgramWithBinary( cl_context context, cl_
return clCreateProgramWithBinary( context, num_devices, device_list, lengths, binaries, binary_status, errcode_ret );
}
+static cl_program WINAPI wrap_clCreateProgramWithBuiltInKernels( cl_context context, cl_uint num_devices, const cl_device_id* device_list, const char* kernel_names, cl_int* errcode_ret )
+{
+ return clCreateProgramWithBuiltInKernels( context, num_devices, device_list, kernel_names, errcode_ret );
+}
+
static cl_program WINAPI wrap_clCreateProgramWithSource( cl_context context, cl_uint count, const char** strings, const size_t* lengths, cl_int* errcode_ret )
{
return clCreateProgramWithSource( context, count, strings, lengths, errcode_ret );
@@ -57,6 +67,11 @@ static cl_mem WINAPI wrap_clCreateSubBuffer( cl_mem buffer, cl_mem_flags flags,
return clCreateSubBuffer( buffer, flags, buffer_create_type, buffer_create_info, errcode_ret );
}
+static cl_int WINAPI wrap_clCreateSubDevices( cl_device_id in_device, const cl_device_partition_property* properties, cl_uint num_devices, cl_device_id* out_devices, cl_uint* num_devices_ret )
+{
+ return clCreateSubDevices( in_device, properties, num_devices, out_devices, num_devices_ret );
+}
+
static cl_event WINAPI wrap_clCreateUserEvent( cl_context context, cl_int* errcode_ret )
{
return clCreateUserEvent( context, errcode_ret );
@@ -67,6 +82,11 @@ static cl_int WINAPI wrap_clEnqueueBarrier( cl_command_queue command_queue )
return clEnqueueBarrier( command_queue );
}
+static cl_int WINAPI wrap_clEnqueueBarrierWithWaitList( cl_command_queue command_queue, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
+{
+ return clEnqueueBarrierWithWaitList( command_queue, num_events_in_wait_list, event_wait_list, event );
+}
+
static cl_int WINAPI wrap_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 )
{
return clEnqueueCopyBuffer( command_queue, src_buffer, dst_buffer, src_offset, dst_offset, size, num_events_in_wait_list, event_wait_list, event );
@@ -92,6 +112,16 @@ static cl_int WINAPI wrap_clEnqueueCopyImageToBuffer( cl_command_queue command_q
return clEnqueueCopyImageToBuffer( command_queue, src_image, dst_buffer, src_origin, region, dst_offset, num_events_in_wait_list, event_wait_list, event );
}
+static cl_int WINAPI wrap_clEnqueueFillBuffer( cl_command_queue command_queue, cl_mem buffer, const void* pattern, size_t pattern_size, size_t offset, size_t size, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
+{
+ return clEnqueueFillBuffer( command_queue, buffer, pattern, pattern_size, offset, size, num_events_in_wait_list, event_wait_list, event );
+}
+
+static cl_int WINAPI wrap_clEnqueueFillImage( cl_command_queue command_queue, cl_mem image, const void* fill_color, const size_t* origin, const size_t* region, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
+{
+ return clEnqueueFillImage( command_queue, image, fill_color, origin, region, num_events_in_wait_list, event_wait_list, event );
+}
+
static void* WINAPI wrap_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 )
{
return clEnqueueMapBuffer( command_queue, buffer, blocking_map, map_flags, offset, size, num_events_in_wait_list, event_wait_list, event, errcode_ret );
@@ -107,6 +137,16 @@ static cl_int WINAPI wrap_clEnqueueMarker( cl_command_queue command_queue, cl_ev
return clEnqueueMarker( command_queue, event );
}
+static cl_int WINAPI wrap_clEnqueueMarkerWithWaitList( cl_command_queue command_queue, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
+{
+ return clEnqueueMarkerWithWaitList( command_queue, num_events_in_wait_list, event_wait_list, event );
+}
+
+static cl_int WINAPI wrap_clEnqueueMigrateMemObjects( cl_command_queue command_queue, cl_uint num_mem_objects, const cl_mem* mem_objects, cl_mem_migration_flags flags, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
+{
+ return clEnqueueMigrateMemObjects( command_queue, num_mem_objects, mem_objects, flags, num_events_in_wait_list, event_wait_list, event );
+}
+
static cl_int WINAPI wrap_clEnqueueNDRangeKernel( cl_command_queue command_queue, 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_events_in_wait_list, const cl_event* event_wait_list, cl_event* event )
{
return clEnqueueNDRangeKernel( command_queue, kernel, work_dim, global_work_offset, global_work_size, local_work_size, num_events_in_wait_list, event_wait_list, event );
@@ -202,6 +242,11 @@ static cl_int WINAPI wrap_clGetImageInfo( cl_mem image, cl_image_info param_name
return clGetImageInfo( image, param_name, param_value_size, param_value, param_value_size_ret );
}
+static cl_int WINAPI wrap_clGetKernelArgInfo( cl_kernel kernel, cl_uint arg_index, cl_kernel_arg_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
+{
+ return clGetKernelArgInfo( kernel, arg_index, param_name, param_value_size, param_value, param_value_size_ret );
+}
+
static cl_int WINAPI wrap_clGetKernelInfo( cl_kernel kernel, cl_kernel_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret )
{
return clGetKernelInfo( kernel, param_name, param_value_size, param_value, param_value_size_ret );
@@ -257,6 +302,11 @@ static cl_int WINAPI wrap_clReleaseContext( cl_context context )
return clReleaseContext( context );
}
+static cl_int WINAPI wrap_clReleaseDevice( cl_device_id device )
+{
+ return clReleaseDevice( device );
+}
+
static cl_int WINAPI wrap_clReleaseEvent( cl_event event )
{
return clReleaseEvent( event );
@@ -292,6 +342,11 @@ static cl_int WINAPI wrap_clRetainContext( cl_context context )
return clRetainContext( context );
}
+static cl_int WINAPI wrap_clRetainDevice( cl_device_id device )
+{
+ return clRetainDevice( device );
+}
+
static cl_int WINAPI wrap_clRetainEvent( cl_event event )
{
return clRetainEvent( event );
@@ -332,6 +387,11 @@ static cl_int WINAPI wrap_clUnloadCompiler( void )
return clUnloadCompiler();
}
+static cl_int WINAPI wrap_clUnloadPlatformCompiler( cl_platform_id platform )
+{
+ return clUnloadPlatformCompiler( platform );
+}
+
static cl_int WINAPI wrap_clWaitForEvents( cl_uint num_events, const cl_event* event_list )
{
return clWaitForEvents( num_events, event_list );
@@ -340,28 +400,37 @@ static cl_int WINAPI wrap_clWaitForEvents( cl_uint num_events, const cl_event* e
const struct opencl_funcs funcs =
{
wrap_clBuildProgram,
+ wrap_clCompileProgram,
wrap_clCreateBuffer,
wrap_clCreateCommandQueue,
wrap_clCreateContext,
wrap_clCreateContextFromType,
+ wrap_clCreateImage,
wrap_clCreateImage2D,
wrap_clCreateImage3D,
wrap_clCreateKernel,
wrap_clCreateKernelsInProgram,
wrap_clCreateProgramWithBinary,
+ wrap_clCreateProgramWithBuiltInKernels,
wrap_clCreateProgramWithSource,
wrap_clCreateSampler,
wrap_clCreateSubBuffer,
+ wrap_clCreateSubDevices,
wrap_clCreateUserEvent,
wrap_clEnqueueBarrier,
+ wrap_clEnqueueBarrierWithWaitList,
wrap_clEnqueueCopyBuffer,
wrap_clEnqueueCopyBufferRect,
wrap_clEnqueueCopyBufferToImage,
wrap_clEnqueueCopyImage,
wrap_clEnqueueCopyImageToBuffer,
+ wrap_clEnqueueFillBuffer,
+ wrap_clEnqueueFillImage,
wrap_clEnqueueMapBuffer,
wrap_clEnqueueMapImage,
wrap_clEnqueueMarker,
+ wrap_clEnqueueMarkerWithWaitList,
+ wrap_clEnqueueMigrateMemObjects,
wrap_clEnqueueNDRangeKernel,
wrap_clEnqueueNativeKernel,
wrap_clEnqueueReadBuffer,
@@ -382,6 +451,7 @@ const struct opencl_funcs funcs =
wrap_clGetEventInfo,
wrap_clGetEventProfilingInfo,
wrap_clGetImageInfo,
+ wrap_clGetKernelArgInfo,
wrap_clGetKernelInfo,
wrap_clGetKernelWorkGroupInfo,
wrap_clGetMemObjectInfo,
@@ -391,8 +461,10 @@ const struct opencl_funcs funcs =
wrap_clGetProgramInfo,
wrap_clGetSamplerInfo,
wrap_clGetSupportedImageFormats,
+ wrap_clLinkProgram,
wrap_clReleaseCommandQueue,
wrap_clReleaseContext,
+ wrap_clReleaseDevice,
wrap_clReleaseEvent,
wrap_clReleaseKernel,
wrap_clReleaseMemObject,
@@ -400,6 +472,7 @@ const struct opencl_funcs funcs =
wrap_clReleaseSampler,
wrap_clRetainCommandQueue,
wrap_clRetainContext,
+ wrap_clRetainDevice,
wrap_clRetainEvent,
wrap_clRetainKernel,
wrap_clRetainMemObject,
@@ -410,5 +483,6 @@ const struct opencl_funcs funcs =
wrap_clSetMemObjectDestructorCallback,
wrap_clSetUserEventStatus,
wrap_clUnloadCompiler,
+ wrap_clUnloadPlatformCompiler,
wrap_clWaitForEvents,
};
diff --git a/dlls/opencl/unix_wrappers.c b/dlls/opencl/unix_wrappers.c
index fb4e611f3f0..9c83250b4e1 100644
--- a/dlls/opencl/unix_wrappers.c
+++ b/dlls/opencl/unix_wrappers.c
@@ -154,6 +154,26 @@ cl_int WINAPI wrap_clSetMemObjectDestructorCallback(cl_mem memobj,
return CL_INVALID_OPERATION;
}
+cl_int WINAPI wrap_clCompileProgram( cl_program program, cl_uint num_devices,
+ const cl_device_id *device_list, const char *options, cl_uint num_input_headers,
+ const cl_program *input_headers, const char **header_include_names,
+ void (WINAPI *pfn_notify)(cl_program program, void *user_data),
+ void *user_data )
+{
+ FIXME( "not yet implemented\n" );
+ return CL_INVALID_OPERATION;
+}
+
+cl_program WINAPI wrap_clLinkProgram( cl_context context, cl_uint num_devices, const cl_device_id *device_list,
+ const char *options, cl_uint num_input_programs, const cl_program *input_programs,
+ void (WINAPI *pfn_notify)(cl_program program, void *user_data),
+ void *user_data, cl_int *errcode_ret )
+{
+ FIXME( "not yet implemented\n" );
+ *errcode_ret = CL_INVALID_OPERATION;
+ return NULL;
+}
+
NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
{
if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS;
diff --git a/dlls/opencl/unixlib.h b/dlls/opencl/unixlib.h
index 617d590acc3..8d454a12b97 100644
--- a/dlls/opencl/unixlib.h
+++ b/dlls/opencl/unixlib.h
@@ -3,28 +3,37 @@
struct opencl_funcs
{
cl_int (WINAPI *pclBuildProgram)( 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), void* user_data );
+ cl_int (WINAPI *pclCompileProgram)( cl_program program, cl_uint num_devices, const cl_device_id* device_list, const char* options, cl_uint num_input_headers, const cl_program* input_headers, const char** header_include_names, void (WINAPI* pfn_notify)(cl_program program, void* user_data), void* user_data );
cl_mem (WINAPI *pclCreateBuffer)( cl_context context, cl_mem_flags flags, size_t size, void* host_ptr, cl_int* errcode_ret );
cl_command_queue (WINAPI *pclCreateCommandQueue)( cl_context context, cl_device_id device, cl_command_queue_properties properties, cl_int* errcode_ret );
cl_context (WINAPI *pclCreateContext)( const cl_context_properties* properties, cl_uint num_devices, const cl_device_id* devices, void (WINAPI* pfn_notify)(const char* errinfo, const void* private_info, size_t cb, void* user_data), void* user_data, cl_int* errcode_ret );
cl_context (WINAPI *pclCreateContextFromType)( const cl_context_properties* properties, cl_device_type device_type, void (WINAPI* pfn_notify)(const char* errinfo, const void* private_info, size_t cb, void* user_data), void* user_data, cl_int* errcode_ret );
+ cl_mem (WINAPI *pclCreateImage)( cl_context context, cl_mem_flags flags, const cl_image_format* image_format, const cl_image_desc* image_desc, void* host_ptr, cl_int* errcode_ret );
cl_mem (WINAPI *pclCreateImage2D)( 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 );
cl_mem (WINAPI *pclCreateImage3D)( 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 );
cl_kernel (WINAPI *pclCreateKernel)( cl_program program, const char* kernel_name, cl_int* errcode_ret );
cl_int (WINAPI *pclCreateKernelsInProgram)( cl_program program, cl_uint num_kernels, cl_kernel* kernels, cl_uint* num_kernels_ret );
cl_program (WINAPI *pclCreateProgramWithBinary)( cl_context context, cl_uint num_devices, const cl_device_id* device_list, const size_t* lengths, const unsigned char** binaries, cl_int* binary_status, cl_int* errcode_ret );
+ cl_program (WINAPI *pclCreateProgramWithBuiltInKernels)( cl_context context, cl_uint num_devices, const cl_device_id* device_list, const char* kernel_names, cl_int* errcode_ret );
cl_program (WINAPI *pclCreateProgramWithSource)( cl_context context, cl_uint count, const char** strings, const size_t* lengths, cl_int* errcode_ret );
cl_sampler (WINAPI *pclCreateSampler)( cl_context context, cl_bool normalized_coords, cl_addressing_mode addressing_mode, cl_filter_mode filter_mode, cl_int* errcode_ret );
cl_mem (WINAPI *pclCreateSubBuffer)( cl_mem buffer, cl_mem_flags flags, cl_buffer_create_type buffer_create_type, const void* buffer_create_info, cl_int* errcode_ret );
+ cl_int (WINAPI *pclCreateSubDevices)( cl_device_id in_device, const cl_device_partition_property* properties, cl_uint num_devices, cl_device_id* out_devices, cl_uint* num_devices_ret );
cl_event (WINAPI *pclCreateUserEvent)( cl_context context, cl_int* errcode_ret );
cl_int (WINAPI *pclEnqueueBarrier)( cl_command_queue command_queue );
+ cl_int (WINAPI *pclEnqueueBarrierWithWaitList)( cl_command_queue command_queue, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event );
cl_int (WINAPI *pclEnqueueCopyBuffer)( 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 );
cl_int (WINAPI *pclEnqueueCopyBufferRect)( cl_command_queue command_queue, 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, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event );
cl_int (WINAPI *pclEnqueueCopyBufferToImage)( 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 );
cl_int (WINAPI *pclEnqueueCopyImage)( cl_command_queue command_queue, 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_events_in_wait_list, const cl_event* event_wait_list, cl_event* event );
cl_int (WINAPI *pclEnqueueCopyImageToBuffer)( 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 );
+ cl_int (WINAPI *pclEnqueueFillBuffer)( cl_command_queue command_queue, cl_mem buffer, const void* pattern, size_t pattern_size, size_t offset, size_t size, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event );
+ cl_int (WINAPI *pclEnqueueFillImage)( cl_command_queue command_queue, cl_mem image, const void* fill_color, const size_t* origin, const size_t* region, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event );
void* (WINAPI *pclEnqueueMapBuffer)( 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 );
void* (WINAPI *pclEnqueueMapImage)( cl_command_queue command_queue, cl_mem image, cl_bool blocking_map, cl_map_flags map_flags, const size_t* origin, const size_t* region, size_t* image_row_pitch, size_t* image_slice_pitch, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event, cl_int* errcode_ret );
cl_int (WINAPI *pclEnqueueMarker)( cl_command_queue command_queue, cl_event* event );
+ cl_int (WINAPI *pclEnqueueMarkerWithWaitList)( cl_command_queue command_queue, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event );
+ cl_int (WINAPI *pclEnqueueMigrateMemObjects)( cl_command_queue command_queue, cl_uint num_mem_objects, const cl_mem* mem_objects, cl_mem_migration_flags flags, cl_uint num_events_in_wait_list, const cl_event* event_wait_list, cl_event* event );
cl_int (WINAPI *pclEnqueueNDRangeKernel)( cl_command_queue command_queue, 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_events_in_wait_list, const cl_event* event_wait_list, cl_event* event );
cl_int (WINAPI *pclEnqueueNativeKernel)( 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 );
cl_int (WINAPI *pclEnqueueReadBuffer)( 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 );
@@ -45,6 +54,7 @@ struct opencl_funcs
cl_int (WINAPI *pclGetEventInfo)( cl_event event, cl_event_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret );
cl_int (WINAPI *pclGetEventProfilingInfo)( cl_event event, cl_profiling_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret );
cl_int (WINAPI *pclGetImageInfo)( cl_mem image, cl_image_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret );
+ cl_int (WINAPI *pclGetKernelArgInfo)( cl_kernel kernel, cl_uint arg_index, cl_kernel_arg_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret );
cl_int (WINAPI *pclGetKernelInfo)( cl_kernel kernel, cl_kernel_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret );
cl_int (WINAPI *pclGetKernelWorkGroupInfo)( 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 );
cl_int (WINAPI *pclGetMemObjectInfo)( cl_mem memobj, cl_mem_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret );
@@ -54,8 +64,10 @@ struct opencl_funcs
cl_int (WINAPI *pclGetProgramInfo)( cl_program program, cl_program_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret );
cl_int (WINAPI *pclGetSamplerInfo)( cl_sampler sampler, cl_sampler_info param_name, size_t param_value_size, void* param_value, size_t* param_value_size_ret );
cl_int (WINAPI *pclGetSupportedImageFormats)( cl_context context, cl_mem_flags flags, cl_mem_object_type image_type, cl_uint num_entries, cl_image_format* image_formats, cl_uint* num_image_formats );
+ cl_program (WINAPI *pclLinkProgram)( cl_context context, cl_uint num_devices, const cl_device_id* device_list, const char* options, cl_uint num_input_programs, const cl_program* input_programs, void (WINAPI* pfn_notify)(cl_program program, void* user_data), void* user_data, cl_int* errcode_ret );
cl_int (WINAPI *pclReleaseCommandQueue)( cl_command_queue command_queue );
cl_int (WINAPI *pclReleaseContext)( cl_context context );
+ cl_int (WINAPI *pclReleaseDevice)( cl_device_id device );
cl_int (WINAPI *pclReleaseEvent)( cl_event event );
cl_int (WINAPI *pclReleaseKernel)( cl_kernel kernel );
cl_int (WINAPI *pclReleaseMemObject)( cl_mem memobj );
@@ -63,6 +75,7 @@ struct opencl_funcs
cl_int (WINAPI *pclReleaseSampler)( cl_sampler sampler );
cl_int (WINAPI *pclRetainCommandQueue)( cl_command_queue command_queue );
cl_int (WINAPI *pclRetainContext)( cl_context context );
+ cl_int (WINAPI *pclRetainDevice)( cl_device_id device );
cl_int (WINAPI *pclRetainEvent)( cl_event event );
cl_int (WINAPI *pclRetainKernel)( cl_kernel kernel );
cl_int (WINAPI *pclRetainMemObject)( cl_mem memobj );
@@ -73,6 +86,7 @@ struct opencl_funcs
cl_int (WINAPI *pclSetMemObjectDestructorCallback)( cl_mem memobj, void (WINAPI* pfn_notify)(cl_mem memobj, void* user_data), void* user_data );
cl_int (WINAPI *pclSetUserEventStatus)( cl_event event, cl_int execution_status );
cl_int (WINAPI *pclUnloadCompiler)( void );
+ cl_int (WINAPI *pclUnloadPlatformCompiler)( cl_platform_id platform );
cl_int (WINAPI *pclWaitForEvents)( cl_uint num_events, const cl_event* event_list );
};
--
2.31.0
More information about the wine-devel
mailing list