Skip to content

Commit 4144b13

Browse files
sherry-yuanpcolberg
sherry-yuan
authored and
pcolberg
committed
Sync Khronos OpenCL-Headers
KhronosGroup/OpenCL-Headers@80c10b1 cl_ext_intelfpga does not exist in ocl header but is still added in this repo because it is needed in profilers etc. This file potentially need to be updated once a while to avoid conflict with khronos header. Upgrade default version to opencl core 3.0. This will not break existing functionality because we are currently already building with 3.0 (see CMakeLists.txt). All future version of opencl core is backward compatible.
1 parent 103cf69 commit 4144b13

16 files changed

+2251
-1240
lines changed

‎include/CL/cl.h

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1311,11 +1311,11 @@ clLinkProgram(cl_context context,
13111311

13121312
#ifdef CL_VERSION_2_2
13131313

1314-
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_2_2_DEPRECATED cl_int CL_API_CALL
1314+
extern CL_API_ENTRY CL_API_PREFIX__VERSION_2_2_DEPRECATED cl_int CL_API_CALL
13151315
clSetProgramReleaseCallback(cl_program program,
13161316
void (CL_CALLBACK * pfn_notify)(cl_program program,
13171317
void * user_data),
1318-
void * user_data) CL_EXT_SUFFIX__VERSION_2_2_DEPRECATED;
1318+
void * user_data) CL_API_SUFFIX__VERSION_2_2_DEPRECATED;
13191319

13201320
extern CL_API_ENTRY cl_int CL_API_CALL
13211321
clSetProgramSpecializationConstant(cl_program program,
@@ -1510,8 +1510,8 @@ extern CL_API_ENTRY cl_int CL_API_CALL
15101510
clEnqueueReadBufferRect(cl_command_queue command_queue,
15111511
cl_mem buffer,
15121512
cl_bool blocking_read,
1513-
const size_t * buffer_offset,
1514-
const size_t * host_offset,
1513+
const size_t * buffer_origin,
1514+
const size_t * host_origin,
15151515
const size_t * region,
15161516
size_t buffer_row_pitch,
15171517
size_t buffer_slice_pitch,
@@ -1541,8 +1541,8 @@ extern CL_API_ENTRY cl_int CL_API_CALL
15411541
clEnqueueWriteBufferRect(cl_command_queue command_queue,
15421542
cl_mem buffer,
15431543
cl_bool blocking_write,
1544-
const size_t * buffer_offset,
1545-
const size_t * host_offset,
1544+
const size_t * buffer_origin,
1545+
const size_t * host_origin,
15461546
const size_t * region,
15471547
size_t buffer_row_pitch,
15481548
size_t buffer_slice_pitch,
@@ -1857,21 +1857,21 @@ clGetExtensionFunctionAddressForPlatform(cl_platform_id platform,
18571857
clSetCommandQueueProperty(cl_command_queue command_queue,
18581858
cl_command_queue_properties properties,
18591859
cl_bool enable,
1860-
cl_command_queue_properties * old_properties) CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED;
1860+
cl_command_queue_properties * old_properties) CL_API_SUFFIX__VERSION_1_0_DEPRECATED;
18611861
#endif /* CL_USE_DEPRECATED_OPENCL_1_0_APIS */
18621862

18631863
/* Deprecated OpenCL 1.1 APIs */
1864-
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
1864+
extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
18651865
clCreateImage2D(cl_context context,
18661866
cl_mem_flags flags,
18671867
const cl_image_format * image_format,
18681868
size_t image_width,
18691869
size_t image_height,
18701870
size_t image_row_pitch,
18711871
void * host_ptr,
1872-
cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
1872+
cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
18731873

1874-
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
1874+
extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
18751875
clCreateImage3D(cl_context context,
18761876
cl_mem_flags flags,
18771877
const cl_image_format * image_format,
@@ -1881,46 +1881,46 @@ clCreateImage3D(cl_context context,
18811881
size_t image_row_pitch,
18821882
size_t image_slice_pitch,
18831883
void * host_ptr,
1884-
cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
1884+
cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
18851885

1886-
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
1886+
extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
18871887
clEnqueueMarker(cl_command_queue command_queue,
1888-
cl_event * event) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
1888+
cl_event * event) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
18891889

1890-
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
1890+
extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
18911891
clEnqueueWaitForEvents(cl_command_queue command_queue,
18921892
cl_uint num_events,
1893-
const cl_event * event_list) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
1893+
const cl_event * event_list) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
18941894

1895-
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
1896-
clEnqueueBarrier(cl_command_queue command_queue) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
1895+
extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
1896+
clEnqueueBarrier(cl_command_queue command_queue) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
18971897

1898-
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
1899-
clUnloadCompiler(void) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
1898+
extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
1899+
clUnloadCompiler(void) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
19001900

1901-
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL
1902-
clGetExtensionFunctionAddress(const char * func_name) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
1901+
extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL
1902+
clGetExtensionFunctionAddress(const char * func_name) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
19031903

19041904
/* Deprecated OpenCL 2.0 APIs */
1905-
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_command_queue CL_API_CALL
1905+
extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_2_DEPRECATED cl_command_queue CL_API_CALL
19061906
clCreateCommandQueue(cl_context context,
19071907
cl_device_id device,
19081908
cl_command_queue_properties properties,
1909-
cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED;
1909+
cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2_DEPRECATED;
19101910

1911-
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_sampler CL_API_CALL
1911+
extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_2_DEPRECATED cl_sampler CL_API_CALL
19121912
clCreateSampler(cl_context context,
19131913
cl_bool normalized_coords,
19141914
cl_addressing_mode addressing_mode,
19151915
cl_filter_mode filter_mode,
1916-
cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED;
1916+
cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2_DEPRECATED;
19171917

1918-
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_int CL_API_CALL
1918+
extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_2_DEPRECATED cl_int CL_API_CALL
19191919
clEnqueueTask(cl_command_queue command_queue,
19201920
cl_kernel kernel,
19211921
cl_uint num_events_in_wait_list,
19221922
const cl_event * event_wait_list,
1923-
cl_event * event) CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED;
1923+
cl_event * event) CL_API_SUFFIX__VERSION_1_2_DEPRECATED;
19241924

19251925
#ifdef __cplusplus
19261926
}

‎include/CL/cl_d3d10.h

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ typedef cl_uint cl_d3d10_device_set_khr;
7575

7676
/******************************************************************************/
7777

78-
typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D10KHR_fn)(
78+
typedef cl_int (CL_API_CALL *clGetDeviceIDsFromD3D10KHR_fn)(
7979
cl_platform_id platform,
8080
cl_d3d10_device_source_khr d3d_device_source,
8181
void * d3d_object,
@@ -84,42 +84,67 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D10KHR_fn)(
8484
cl_device_id * devices,
8585
cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_0;
8686

87-
typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10BufferKHR_fn)(
87+
typedef cl_mem (CL_API_CALL *clCreateFromD3D10BufferKHR_fn)(
8888
cl_context context,
8989
cl_mem_flags flags,
9090
ID3D10Buffer * resource,
9191
cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0;
9292

93-
typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture2DKHR_fn)(
93+
typedef cl_mem (CL_API_CALL *clCreateFromD3D10Texture2DKHR_fn)(
9494
cl_context context,
9595
cl_mem_flags flags,
9696
ID3D10Texture2D * resource,
9797
UINT subresource,
9898
cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0;
9999

100-
typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture3DKHR_fn)(
100+
typedef cl_mem (CL_API_CALL *clCreateFromD3D10Texture3DKHR_fn)(
101101
cl_context context,
102102
cl_mem_flags flags,
103103
ID3D10Texture3D * resource,
104104
UINT subresource,
105105
cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_0;
106106

107-
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D10ObjectsKHR_fn)(
107+
typedef cl_int (CL_API_CALL *clEnqueueAcquireD3D10ObjectsKHR_fn)(
108108
cl_command_queue command_queue,
109109
cl_uint num_objects,
110110
const cl_mem * mem_objects,
111111
cl_uint num_events_in_wait_list,
112112
const cl_event * event_wait_list,
113113
cl_event * event) CL_API_SUFFIX__VERSION_1_0;
114114

115-
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D10ObjectsKHR_fn)(
115+
typedef cl_int (CL_API_CALL *clEnqueueReleaseD3D10ObjectsKHR_fn)(
116116
cl_command_queue command_queue,
117117
cl_uint num_objects,
118118
const cl_mem * mem_objects,
119119
cl_uint num_events_in_wait_list,
120120
const cl_event * event_wait_list,
121121
cl_event * event) CL_API_SUFFIX__VERSION_1_0;
122122

123+
/***************************************************************
124+
* cl_intel_sharing_format_query_d3d10
125+
***************************************************************/
126+
#define cl_intel_sharing_format_query_d3d10 1
127+
128+
/* when cl_khr_d3d10_sharing is supported */
129+
130+
extern CL_API_ENTRY cl_int CL_API_CALL
131+
clGetSupportedD3D10TextureFormatsINTEL(
132+
cl_context context,
133+
cl_mem_flags flags,
134+
cl_mem_object_type image_type,
135+
cl_uint num_entries,
136+
DXGI_FORMAT* d3d10_formats,
137+
cl_uint* num_texture_formats) ;
138+
139+
typedef cl_int (CL_API_CALL *
140+
clGetSupportedD3D10TextureFormatsINTEL_fn)(
141+
cl_context context,
142+
cl_mem_flags flags,
143+
cl_mem_object_type image_type,
144+
cl_uint num_entries,
145+
DXGI_FORMAT* d3d10_formats,
146+
cl_uint* num_texture_formats) ;
147+
123148
#ifdef __cplusplus
124149
}
125150
#endif

‎include/CL/cl_d3d11.h

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ typedef cl_uint cl_d3d11_device_set_khr;
7575

7676
/******************************************************************************/
7777

78-
typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D11KHR_fn)(
78+
typedef cl_int (CL_API_CALL *clGetDeviceIDsFromD3D11KHR_fn)(
7979
cl_platform_id platform,
8080
cl_d3d11_device_source_khr d3d_device_source,
8181
void * d3d_object,
@@ -84,42 +84,69 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D11KHR_fn)(
8484
cl_device_id * devices,
8585
cl_uint * num_devices) CL_API_SUFFIX__VERSION_1_2;
8686

87-
typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11BufferKHR_fn)(
87+
typedef cl_mem (CL_API_CALL *clCreateFromD3D11BufferKHR_fn)(
8888
cl_context context,
8989
cl_mem_flags flags,
9090
ID3D11Buffer * resource,
9191
cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2;
9292

93-
typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture2DKHR_fn)(
93+
typedef cl_mem (CL_API_CALL *clCreateFromD3D11Texture2DKHR_fn)(
9494
cl_context context,
9595
cl_mem_flags flags,
9696
ID3D11Texture2D * resource,
9797
UINT subresource,
9898
cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2;
9999

100-
typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture3DKHR_fn)(
100+
typedef cl_mem (CL_API_CALL *clCreateFromD3D11Texture3DKHR_fn)(
101101
cl_context context,
102102
cl_mem_flags flags,
103103
ID3D11Texture3D * resource,
104104
UINT subresource,
105105
cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2;
106106

107-
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D11ObjectsKHR_fn)(
107+
typedef cl_int (CL_API_CALL *clEnqueueAcquireD3D11ObjectsKHR_fn)(
108108
cl_command_queue command_queue,
109109
cl_uint num_objects,
110110
const cl_mem * mem_objects,
111111
cl_uint num_events_in_wait_list,
112112
const cl_event * event_wait_list,
113113
cl_event * event) CL_API_SUFFIX__VERSION_1_2;
114114

115-
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D11ObjectsKHR_fn)(
115+
typedef cl_int (CL_API_CALL *clEnqueueReleaseD3D11ObjectsKHR_fn)(
116116
cl_command_queue command_queue,
117117
cl_uint num_objects,
118118
const cl_mem * mem_objects,
119119
cl_uint num_events_in_wait_list,
120120
const cl_event * event_wait_list,
121121
cl_event * event) CL_API_SUFFIX__VERSION_1_2;
122122

123+
/***************************************************************
124+
* cl_intel_sharing_format_query_d3d11
125+
***************************************************************/
126+
#define cl_intel_sharing_format_query_d3d11 1
127+
128+
/* when cl_khr_d3d11_sharing is supported */
129+
130+
extern CL_API_ENTRY cl_int CL_API_CALL
131+
clGetSupportedD3D11TextureFormatsINTEL(
132+
cl_context context,
133+
cl_mem_flags flags,
134+
cl_mem_object_type image_type,
135+
cl_uint plane,
136+
cl_uint num_entries,
137+
DXGI_FORMAT* d3d11_formats,
138+
cl_uint* num_texture_formats) ;
139+
140+
typedef cl_int (CL_API_CALL *
141+
clGetSupportedD3D11TextureFormatsINTEL_fn)(
142+
cl_context context,
143+
cl_mem_flags flags,
144+
cl_mem_object_type image_type,
145+
cl_uint plane,
146+
cl_uint num_entries,
147+
DXGI_FORMAT* d3d11_formats,
148+
cl_uint* num_texture_formats) ;
149+
123150
#ifdef __cplusplus
124151
}
125152
#endif

0 commit comments

Comments
 (0)