Skip to content

A
angle
Commit 908ead38 by John Plate Committed by Commit Bot
Options

Updated OpenCL headers

Bug: angleproject:5761 Change-Id: I45e0f9a422a0dd94fec854d3387f676192e020eb Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2831303Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: John Plate <jplate@google.com>
parent e25f3b10
Showing with 114 additions and 123 deletions
include/CL/README.md
# ANGLE OpenCL Headers # ANGLE OpenCL Headers
The OpenCL headers ANGLE uses are the original headers from Khronos, but they are modified to allow The OpenCL headers ANGLE uses are the original headers from Khronos.
the macro `CL_API_ENTRY` to be overridden externally.
The modifications have been [submitted](https://github.com/KhronosGroup/OpenCL-Headers/pull/162) to ### Updating headers
Khronos, and this document should be updated after they are merged.
### Regenerating headers
1. Clone [https://github.com/KhronosGroup/OpenCL-Headers.git](https://github.com/KhronosGroup/OpenCL-Headers.git). 1. Clone [https://github.com/KhronosGroup/OpenCL-Headers.git](https://github.com/KhronosGroup/OpenCL-Headers.git).
1. Inspect the differences between all headers from `OpenCL-Headers/CL/` and this folder.
* Changes of supported enums have to be updated in `src/common/packed_cl_enums.json`.
* Changes of supported entry points have to be updated in `src/libGLESv2/cl_stubs.cpp`.
1. Copy all headers from `OpenCL-Headers/CL/` over to this folder. 1. Copy all headers from `OpenCL-Headers/CL/` over to this folder.
1. Edit the headers:
* Change all occurences of `typedef CL_API_ENTRY` to `typedef`.
* In `cl_platform.h` change both `#define CL_API_ENTRY` to
```
#if !defined(CL_API_ENTRY)
#define CL_API_ENTRY
#endif
```
include/CL/cl.h
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#ifndef __OPENCL_CL_H #ifndef __OPENCL_CL_H
#define __OPENCL_CL_H #define __OPENCL_CL_H
#include <CL/cl_platform.h>
#include <CL/cl_version.h> #include <CL/cl_version.h>
#include <CL/cl_platform.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -1311,11 +1311,11 @@ clLinkProgram(cl_context context, ...@@ -1311,11 +1311,11 @@ clLinkProgram(cl_context context,
#ifdef CL_VERSION_2_2 #ifdef CL_VERSION_2_2
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_2_2_DEPRECATED cl_int CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_2_2_DEPRECATED cl_int CL_API_CALL
clSetProgramReleaseCallback(cl_program program, clSetProgramReleaseCallback(cl_program program,
void (CL_CALLBACK * pfn_notify)(cl_program program, void (CL_CALLBACK * pfn_notify)(cl_program program,
void * user_data), void * user_data),
void * user_data) CL_EXT_SUFFIX__VERSION_2_2_DEPRECATED; void * user_data) CL_API_SUFFIX__VERSION_2_2_DEPRECATED;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clSetProgramSpecializationConstant(cl_program program, clSetProgramSpecializationConstant(cl_program program,
...@@ -1857,11 +1857,11 @@ clGetExtensionFunctionAddressForPlatform(cl_platform_id platform, ...@@ -1857,11 +1857,11 @@ clGetExtensionFunctionAddressForPlatform(cl_platform_id platform,
clSetCommandQueueProperty(cl_command_queue command_queue, clSetCommandQueueProperty(cl_command_queue command_queue,
cl_command_queue_properties properties, cl_command_queue_properties properties,
cl_bool enable, cl_bool enable,
cl_command_queue_properties * old_properties) CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED; cl_command_queue_properties * old_properties) CL_API_SUFFIX__VERSION_1_0_DEPRECATED;
#endif /* CL_USE_DEPRECATED_OPENCL_1_0_APIS */ #endif /* CL_USE_DEPRECATED_OPENCL_1_0_APIS */
/* Deprecated OpenCL 1.1 APIs */ /* Deprecated OpenCL 1.1 APIs */
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
clCreateImage2D(cl_context context, clCreateImage2D(cl_context context,
cl_mem_flags flags, cl_mem_flags flags,
const cl_image_format * image_format, const cl_image_format * image_format,
...@@ -1869,9 +1869,9 @@ clCreateImage2D(cl_context context, ...@@ -1869,9 +1869,9 @@ clCreateImage2D(cl_context context,
size_t image_height, size_t image_height,
size_t image_row_pitch, size_t image_row_pitch,
void * host_ptr, void * host_ptr,
cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
clCreateImage3D(cl_context context, clCreateImage3D(cl_context context,
cl_mem_flags flags, cl_mem_flags flags,
const cl_image_format * image_format, const cl_image_format * image_format,
...@@ -1881,46 +1881,46 @@ clCreateImage3D(cl_context context, ...@@ -1881,46 +1881,46 @@ clCreateImage3D(cl_context context,
size_t image_row_pitch, size_t image_row_pitch,
size_t image_slice_pitch, size_t image_slice_pitch,
void * host_ptr, void * host_ptr,
cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
clEnqueueMarker(cl_command_queue command_queue, clEnqueueMarker(cl_command_queue command_queue,
cl_event * event) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; cl_event * event) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
clEnqueueWaitForEvents(cl_command_queue command_queue, clEnqueueWaitForEvents(cl_command_queue command_queue,
cl_uint num_events, cl_uint num_events,
const cl_event * event_list) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; const cl_event * event_list) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
clEnqueueBarrier(cl_command_queue command_queue) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; clEnqueueBarrier(cl_command_queue command_queue) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
clUnloadCompiler(void) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; clUnloadCompiler(void) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL
clGetExtensionFunctionAddress(const char * func_name) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; clGetExtensionFunctionAddress(const char * func_name) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
/* Deprecated OpenCL 2.0 APIs */ /* Deprecated OpenCL 2.0 APIs */
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_command_queue CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_2_DEPRECATED cl_command_queue CL_API_CALL
clCreateCommandQueue(cl_context context, clCreateCommandQueue(cl_context context,
cl_device_id device, cl_device_id device,
cl_command_queue_properties properties, cl_command_queue_properties properties,
cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2_DEPRECATED;
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_sampler CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_2_DEPRECATED cl_sampler CL_API_CALL
clCreateSampler(cl_context context, clCreateSampler(cl_context context,
cl_bool normalized_coords, cl_bool normalized_coords,
cl_addressing_mode addressing_mode, cl_addressing_mode addressing_mode,
cl_filter_mode filter_mode, cl_filter_mode filter_mode,
cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_2_DEPRECATED;
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_int CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_2_DEPRECATED cl_int CL_API_CALL
clEnqueueTask(cl_command_queue command_queue, clEnqueueTask(cl_command_queue command_queue,
cl_kernel kernel, cl_kernel kernel,
cl_uint num_events_in_wait_list, cl_uint num_events_in_wait_list,
const cl_event * event_wait_list, const cl_event * event_wait_list,
cl_event * event) CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED; cl_event * event) CL_API_SUFFIX__VERSION_1_2_DEPRECATED;
#ifdef __cplusplus #ifdef __cplusplus
} }
......
include/CL/cl_dx9_media_sharing.h
...@@ -159,7 +159,7 @@ clGetDeviceIDsFromDX9INTEL( ...@@ -159,7 +159,7 @@ clGetDeviceIDsFromDX9INTEL(
cl_dx9_device_set_intel dx9_device_set, cl_dx9_device_set_intel dx9_device_set,
cl_uint num_entries, cl_uint num_entries,
cl_device_id* devices, cl_device_id* devices,
cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_1; cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_1;
typedef cl_int (CL_API_CALL* clGetDeviceIDsFromDX9INTEL_fn)( typedef cl_int (CL_API_CALL* clGetDeviceIDsFromDX9INTEL_fn)(
cl_platform_id platform, cl_platform_id platform,
...@@ -168,7 +168,7 @@ typedef cl_int (CL_API_CALL* clGetDeviceIDsFromDX9INTEL_fn)( ...@@ -168,7 +168,7 @@ typedef cl_int (CL_API_CALL* clGetDeviceIDsFromDX9INTEL_fn)(
cl_dx9_device_set_intel dx9_device_set, cl_dx9_device_set_intel dx9_device_set,
cl_uint num_entries, cl_uint num_entries,
cl_device_id* devices, cl_device_id* devices,
cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_1; cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_1;
extern CL_API_ENTRY cl_mem CL_API_CALL extern CL_API_ENTRY cl_mem CL_API_CALL
clCreateFromDX9MediaSurfaceINTEL( clCreateFromDX9MediaSurfaceINTEL(
...@@ -177,7 +177,7 @@ clCreateFromDX9MediaSurfaceINTEL( ...@@ -177,7 +177,7 @@ clCreateFromDX9MediaSurfaceINTEL(
IDirect3DSurface9* resource, IDirect3DSurface9* resource,
HANDLE sharedHandle, HANDLE sharedHandle,
UINT plane, UINT plane,
cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_1; cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_1;
typedef cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceINTEL_fn)( typedef cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceINTEL_fn)(
cl_context context, cl_context context,
...@@ -185,7 +185,7 @@ typedef cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceINTEL_fn)( ...@@ -185,7 +185,7 @@ typedef cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceINTEL_fn)(
IDirect3DSurface9* resource, IDirect3DSurface9* resource,
HANDLE sharedHandle, HANDLE sharedHandle,
UINT plane, UINT plane,
cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_1; cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_1;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueAcquireDX9ObjectsINTEL( clEnqueueAcquireDX9ObjectsINTEL(
...@@ -194,7 +194,7 @@ clEnqueueAcquireDX9ObjectsINTEL( ...@@ -194,7 +194,7 @@ clEnqueueAcquireDX9ObjectsINTEL(
const cl_mem* mem_objects, const cl_mem* mem_objects,
cl_uint num_events_in_wait_list, cl_uint num_events_in_wait_list,
const cl_event* event_wait_list, const cl_event* event_wait_list,
cl_event* event) CL_EXT_SUFFIX__VERSION_1_1; cl_event* event) CL_API_SUFFIX__VERSION_1_1;
typedef cl_int (CL_API_CALL *clEnqueueAcquireDX9ObjectsINTEL_fn)( typedef cl_int (CL_API_CALL *clEnqueueAcquireDX9ObjectsINTEL_fn)(
cl_command_queue command_queue, cl_command_queue command_queue,
...@@ -202,7 +202,7 @@ typedef cl_int (CL_API_CALL *clEnqueueAcquireDX9ObjectsINTEL_fn)( ...@@ -202,7 +202,7 @@ typedef cl_int (CL_API_CALL *clEnqueueAcquireDX9ObjectsINTEL_fn)(
const cl_mem* mem_objects, const cl_mem* mem_objects,
cl_uint num_events_in_wait_list, cl_uint num_events_in_wait_list,
const cl_event* event_wait_list, const cl_event* event_wait_list,
cl_event* event) CL_EXT_SUFFIX__VERSION_1_1; cl_event* event) CL_API_SUFFIX__VERSION_1_1;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueReleaseDX9ObjectsINTEL( clEnqueueReleaseDX9ObjectsINTEL(
...@@ -211,7 +211,7 @@ clEnqueueReleaseDX9ObjectsINTEL( ...@@ -211,7 +211,7 @@ clEnqueueReleaseDX9ObjectsINTEL(
cl_mem* mem_objects, cl_mem* mem_objects,
cl_uint num_events_in_wait_list, cl_uint num_events_in_wait_list,
const cl_event* event_wait_list, const cl_event* event_wait_list,
cl_event* event) CL_EXT_SUFFIX__VERSION_1_1; cl_event* event) CL_API_SUFFIX__VERSION_1_1;
typedef cl_int (CL_API_CALL *clEnqueueReleaseDX9ObjectsINTEL_fn)( typedef cl_int (CL_API_CALL *clEnqueueReleaseDX9ObjectsINTEL_fn)(
cl_command_queue command_queue, cl_command_queue command_queue,
...@@ -219,7 +219,7 @@ typedef cl_int (CL_API_CALL *clEnqueueReleaseDX9ObjectsINTEL_fn)( ...@@ -219,7 +219,7 @@ typedef cl_int (CL_API_CALL *clEnqueueReleaseDX9ObjectsINTEL_fn)(
cl_mem* mem_objects, cl_mem* mem_objects,
cl_uint num_events_in_wait_list, cl_uint num_events_in_wait_list,
const cl_event* event_wait_list, const cl_event* event_wait_list,
cl_event* event) CL_EXT_SUFFIX__VERSION_1_1; cl_event* event) CL_API_SUFFIX__VERSION_1_1;
#ifdef __cplusplus #ifdef __cplusplus
} }
......
include/CL/cl_gl.h
...@@ -102,21 +102,21 @@ clEnqueueReleaseGLObjects(cl_command_queue command_queue, ...@@ -102,21 +102,21 @@ clEnqueueReleaseGLObjects(cl_command_queue command_queue,
/* Deprecated OpenCL 1.1 APIs */ /* Deprecated OpenCL 1.1 APIs */
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
clCreateFromGLTexture2D(cl_context context, clCreateFromGLTexture2D(cl_context context,
cl_mem_flags flags, cl_mem_flags flags,
cl_GLenum target, cl_GLenum target,
cl_GLint miplevel, cl_GLint miplevel,
cl_GLuint texture, cl_GLuint texture,
cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL extern CL_API_ENTRY CL_API_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
clCreateFromGLTexture3D(cl_context context, clCreateFromGLTexture3D(cl_context context,
cl_mem_flags flags, cl_mem_flags flags,
cl_GLenum target, cl_GLenum target,
cl_GLint miplevel, cl_GLint miplevel,
cl_GLuint texture, cl_GLuint texture,
cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
/* cl_khr_gl_sharing extension */ /* cl_khr_gl_sharing extension */
...@@ -160,7 +160,7 @@ typedef cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)( ...@@ -160,7 +160,7 @@ typedef cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)(
extern CL_API_ENTRY cl_event CL_API_CALL extern CL_API_ENTRY cl_event CL_API_CALL
clCreateEventFromGLsyncKHR(cl_context context, clCreateEventFromGLsyncKHR(cl_context context,
cl_GLsync sync, cl_GLsync sync,
cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_1; cl_int * errcode_ret) CL_API_SUFFIX__VERSION_1_1;
#ifdef __cplusplus #ifdef __cplusplus
} }
......
include/CL/cl_icd.h
...@@ -409,7 +409,7 @@ typedef cl_int(CL_API_CALL *cl_api_clGetKernelSubGroupInfoKHR)( ...@@ -409,7 +409,7 @@ typedef cl_int(CL_API_CALL *cl_api_clGetKernelSubGroupInfoKHR)(
cl_kernel_sub_group_info /* param_name */, size_t /*input_value_size*/, cl_kernel_sub_group_info /* param_name */, size_t /*input_value_size*/,
const void * /*input_value*/, size_t /*param_value_size*/, const void * /*input_value*/, size_t /*param_value_size*/,
void * /*param_value*/, void * /*param_value*/,
size_t * /*param_value_size_ret*/) CL_EXT_SUFFIX__VERSION_2_0; size_t * /*param_value_size_ret*/) CL_API_SUFFIX__VERSION_2_0;
#else #else
...@@ -704,35 +704,35 @@ typedef void *cl_api_clEnqueueSVMUnmap; ...@@ -704,35 +704,35 @@ typedef void *cl_api_clEnqueueSVMUnmap;
typedef cl_int(CL_API_CALL *cl_api_clSetCommandQueueProperty)( typedef cl_int(CL_API_CALL *cl_api_clSetCommandQueueProperty)(
cl_command_queue command_queue, cl_command_queue_properties properties, cl_command_queue command_queue, cl_command_queue_properties properties,
cl_bool enable, cl_command_queue_properties *old_properties) cl_bool enable, cl_command_queue_properties *old_properties)
CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED; CL_API_SUFFIX__VERSION_1_0_DEPRECATED;
typedef cl_mem(CL_API_CALL *cl_api_clCreateImage2D)( typedef cl_mem(CL_API_CALL *cl_api_clCreateImage2D)(
cl_context context, cl_mem_flags flags, const cl_image_format *image_format, 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, size_t image_width, size_t image_height, size_t image_row_pitch,
void *host_ptr, cl_int *errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; void *host_ptr, cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
typedef cl_mem(CL_API_CALL *cl_api_clCreateImage3D)( typedef cl_mem(CL_API_CALL *cl_api_clCreateImage3D)(
cl_context context, cl_mem_flags flags, const cl_image_format *image_format, 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_width, size_t image_height, size_t image_depth,
size_t image_row_pitch, size_t image_slice_pitch, void *host_ptr, size_t image_row_pitch, size_t image_slice_pitch, void *host_ptr,
cl_int *errcode_ret) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; cl_int *errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
typedef cl_int(CL_API_CALL *cl_api_clUnloadCompiler)(void) typedef cl_int(CL_API_CALL *cl_api_clUnloadCompiler)(void)
CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
typedef cl_int(CL_API_CALL *cl_api_clEnqueueMarker)( typedef cl_int(CL_API_CALL *cl_api_clEnqueueMarker)(
cl_command_queue command_queue, cl_command_queue command_queue,
cl_event *event) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; cl_event *event) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
typedef cl_int(CL_API_CALL *cl_api_clEnqueueWaitForEvents)( typedef cl_int(CL_API_CALL *cl_api_clEnqueueWaitForEvents)(
cl_command_queue command_queue, cl_uint num_events, cl_command_queue command_queue, cl_uint num_events,
const cl_event *event_list) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; const cl_event *event_list) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
typedef cl_int(CL_API_CALL *cl_api_clEnqueueBarrier)( typedef cl_int(CL_API_CALL *cl_api_clEnqueueBarrier)(
cl_command_queue command_queue) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; cl_command_queue command_queue) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
typedef void *(CL_API_CALL *cl_api_clGetExtensionFunctionAddress)( typedef void *(CL_API_CALL *cl_api_clGetExtensionFunctionAddress)(
const char *function_name)CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; const char *function_name)CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
// GL and other APIs // GL and other APIs
typedef cl_mem(CL_API_CALL *cl_api_clCreateFromGLBuffer)( typedef cl_mem(CL_API_CALL *cl_api_clCreateFromGLBuffer)(
......
include/CL/cl_layer.h
...@@ -36,7 +36,7 @@ clGetLayerInfo(cl_layer_info param_name, ...@@ -36,7 +36,7 @@ clGetLayerInfo(cl_layer_info param_name,
void *param_value, void *param_value,
size_t *param_value_size_ret); size_t *param_value_size_ret);
CL_API_ENTRY typedef cl_int typedef cl_int
(CL_API_CALL *pfn_clGetLayerInfo)(cl_layer_info param_name, (CL_API_CALL *pfn_clGetLayerInfo)(cl_layer_info param_name,
size_t param_value_size, size_t param_value_size,
void *param_value, void *param_value,
...@@ -48,7 +48,7 @@ clInitLayer(cl_uint num_entries, ...@@ -48,7 +48,7 @@ clInitLayer(cl_uint num_entries,
cl_uint *num_entries_ret, cl_uint *num_entries_ret,
const cl_icd_dispatch **layer_dispatch_ret); const cl_icd_dispatch **layer_dispatch_ret);
CL_API_ENTRY typedef cl_int typedef cl_int
(CL_API_CALL *pfn_clInitLayer)(cl_uint num_entries, (CL_API_CALL *pfn_clInitLayer)(cl_uint num_entries,
const cl_icd_dispatch *target_dispatch, const cl_icd_dispatch *target_dispatch,
cl_uint *num_entries_ret, cl_uint *num_entries_ret,
......
include/CL/cl_platform.h
...@@ -27,14 +27,22 @@ extern "C" { ...@@ -27,14 +27,22 @@ extern "C" {
#if !defined(CL_API_ENTRY) #if !defined(CL_API_ENTRY)
#define CL_API_ENTRY #define CL_API_ENTRY
#endif #endif
#define CL_API_CALL __stdcall #if !defined(CL_API_CALL)
#define CL_CALLBACK __stdcall #define CL_API_CALL __stdcall
#endif
#if !defined(CL_CALLBACK)
#define CL_CALLBACK __stdcall
#endif
#else #else
#if !defined(CL_API_ENTRY) #if !defined(CL_API_ENTRY)
#define CL_API_ENTRY #define CL_API_ENTRY
#endif #endif
#define CL_API_CALL #if !defined(CL_API_CALL)
#define CL_CALLBACK #define CL_API_CALL
#endif
#if !defined(CL_CALLBACK)
#define CL_CALLBACK
#endif
#endif #endif
/* /*
...@@ -57,84 +65,82 @@ extern "C" { ...@@ -57,84 +65,82 @@ extern "C" {
#define CL_API_PREFIX_COMMON CL_API_PREFIX_USER #define CL_API_PREFIX_COMMON CL_API_PREFIX_USER
#define CL_API_SUFFIX__VERSION_1_0 CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_1_0 CL_API_SUFFIX_COMMON
#define CL_EXT_SUFFIX__VERSION_1_0 CL_API_SUFFIX_COMMON
#define CL_API_SUFFIX__VERSION_1_1 CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_1_1 CL_API_SUFFIX_COMMON
#define CL_EXT_SUFFIX__VERSION_1_1 CL_API_SUFFIX_COMMON
#define CL_API_SUFFIX__VERSION_1_2 CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_1_2 CL_API_SUFFIX_COMMON
#define CL_EXT_SUFFIX__VERSION_1_2 CL_API_SUFFIX_COMMON
#define CL_API_SUFFIX__VERSION_2_0 CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_2_0 CL_API_SUFFIX_COMMON
#define CL_EXT_SUFFIX__VERSION_2_0 CL_API_SUFFIX_COMMON
#define CL_API_SUFFIX__VERSION_2_1 CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_2_1 CL_API_SUFFIX_COMMON
#define CL_EXT_SUFFIX__VERSION_2_1 CL_API_SUFFIX_COMMON
#define CL_API_SUFFIX__VERSION_2_2 CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_2_2 CL_API_SUFFIX_COMMON
#define CL_EXT_SUFFIX__VERSION_2_2 CL_API_SUFFIX_COMMON
#define CL_API_SUFFIX__VERSION_3_0 CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_3_0 CL_API_SUFFIX_COMMON
#define CL_EXT_SUFFIX__VERSION_3_0 CL_API_SUFFIX_COMMON
#define CL_API_SUFFIX__EXPERIMENTAL CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__EXPERIMENTAL CL_API_SUFFIX_COMMON
#define CL_EXT_SUFFIX__EXPERIMENTAL CL_API_SUFFIX_COMMON
#ifdef __GNUC__ #ifdef __GNUC__
#define CL_EXT_SUFFIX_DEPRECATED __attribute__((deprecated)) #define CL_API_SUFFIX_DEPRECATED __attribute__((deprecated))
#define CL_EXT_PREFIX_DEPRECATED #define CL_API_PREFIX_DEPRECATED
#elif defined(_WIN32) #elif defined(_WIN32)
#define CL_EXT_SUFFIX_DEPRECATED #define CL_API_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX_DEPRECATED __declspec(deprecated) #define CL_API_PREFIX_DEPRECATED __declspec(deprecated)
#else #else
#define CL_EXT_SUFFIX_DEPRECATED #define CL_API_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX_DEPRECATED #define CL_API_PREFIX_DEPRECATED
#endif #endif
#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_1_0_DEPRECATED CL_API_SUFFIX_COMMON
#define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED CL_API_PREFIX_COMMON #define CL_API_PREFIX__VERSION_1_0_DEPRECATED CL_API_PREFIX_COMMON
#else #else
#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED CL_API_SUFFIX_COMMON CL_EXT_SUFFIX_DEPRECATED #define CL_API_SUFFIX__VERSION_1_0_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED CL_API_PREFIX_COMMON CL_EXT_PREFIX_DEPRECATED #define CL_API_PREFIX__VERSION_1_0_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED
#endif #endif
#ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS
#define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_1_1_DEPRECATED CL_API_SUFFIX_COMMON
#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED CL_API_PREFIX_COMMON #define CL_API_PREFIX__VERSION_1_1_DEPRECATED CL_API_PREFIX_COMMON
#else #else
#define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED CL_API_SUFFIX_COMMON CL_EXT_SUFFIX_DEPRECATED #define CL_API_SUFFIX__VERSION_1_1_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED CL_API_PREFIX_COMMON CL_EXT_PREFIX_DEPRECATED #define CL_API_PREFIX__VERSION_1_1_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED
#endif #endif
#ifdef CL_USE_DEPRECATED_OPENCL_1_2_APIS #ifdef CL_USE_DEPRECATED_OPENCL_1_2_APIS
#define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_1_2_DEPRECATED CL_API_SUFFIX_COMMON
#define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED CL_API_PREFIX_COMMON #define CL_API_PREFIX__VERSION_1_2_DEPRECATED CL_API_PREFIX_COMMON
#else #else
#define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED CL_API_SUFFIX_COMMON CL_EXT_SUFFIX_DEPRECATED #define CL_API_SUFFIX__VERSION_1_2_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED CL_API_PREFIX_COMMON CL_EXT_PREFIX_DEPRECATED #define CL_API_PREFIX__VERSION_1_2_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED
#endif #endif
#ifdef CL_USE_DEPRECATED_OPENCL_2_0_APIS #ifdef CL_USE_DEPRECATED_OPENCL_2_0_APIS
#define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_2_0_DEPRECATED CL_API_SUFFIX_COMMON
#define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED CL_API_PREFIX_COMMON #define CL_API_PREFIX__VERSION_2_0_DEPRECATED CL_API_PREFIX_COMMON
#else #else
#define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED CL_API_SUFFIX_COMMON CL_EXT_SUFFIX_DEPRECATED #define CL_API_SUFFIX__VERSION_2_0_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED CL_API_PREFIX_COMMON CL_EXT_PREFIX_DEPRECATED #define CL_API_PREFIX__VERSION_2_0_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED
#endif #endif
#ifdef CL_USE_DEPRECATED_OPENCL_2_1_APIS #ifdef CL_USE_DEPRECATED_OPENCL_2_1_APIS
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_2_1_DEPRECATED CL_API_SUFFIX_COMMON
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED CL_API_PREFIX_COMMON #define CL_API_PREFIX__VERSION_2_1_DEPRECATED CL_API_PREFIX_COMMON
#else #else
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED CL_API_SUFFIX_COMMON CL_EXT_SUFFIX_DEPRECATED #define CL_API_SUFFIX__VERSION_2_1_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED CL_API_PREFIX_COMMON CL_EXT_PREFIX_DEPRECATED #define CL_API_PREFIX__VERSION_2_1_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED
#endif #endif
#ifdef CL_USE_DEPRECATED_OPENCL_2_2_APIS #ifdef CL_USE_DEPRECATED_OPENCL_2_2_APIS
#define CL_EXT_SUFFIX__VERSION_2_2_DEPRECATED CL_API_SUFFIX_COMMON #define CL_API_SUFFIX__VERSION_2_2_DEPRECATED CL_API_SUFFIX_COMMON
#define CL_EXT_PREFIX__VERSION_2_2_DEPRECATED CL_API_PREFIX_COMMON #define CL_API_PREFIX__VERSION_2_2_DEPRECATED CL_API_PREFIX_COMMON
#else #else
#define CL_EXT_SUFFIX__VERSION_2_2_DEPRECATED CL_API_SUFFIX_COMMON CL_EXT_SUFFIX_DEPRECATED #define CL_API_SUFFIX__VERSION_2_2_DEPRECATED CL_API_SUFFIX_COMMON CL_API_SUFFIX_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_2_DEPRECATED CL_API_PREFIX_COMMON CL_EXT_PREFIX_DEPRECATED #define CL_API_PREFIX__VERSION_2_2_DEPRECATED CL_API_PREFIX_COMMON CL_API_PREFIX_DEPRECATED
#endif #endif
#if (defined (_WIN32) && defined(_MSC_VER)) #if (defined (_WIN32) && defined(_MSC_VER))
/* intptr_t is used in cl.h and provided by stddef.h in Visual C++, but not in clang */
/* stdint.h was missing before Visual Studio 2010, include it for later versions and for clang */
#if defined(__clang__) || _MSC_VER >= 1600
#include <stdint.h>
#endif
/* scalar types */ /* scalar types */
typedef signed __int8 cl_char; typedef signed __int8 cl_char;
typedef unsigned __int8 cl_uchar; typedef unsigned __int8 cl_uchar;
......
include/CL/cl_va_api_media_sharing_intel.h
...@@ -68,16 +68,16 @@ clGetDeviceIDsFromVA_APIMediaAdapterINTEL( ...@@ -68,16 +68,16 @@ clGetDeviceIDsFromVA_APIMediaAdapterINTEL(
cl_va_api_device_set_intel media_adapter_set, cl_va_api_device_set_intel media_adapter_set,
cl_uint num_entries, cl_uint num_entries,
cl_device_id* devices, cl_device_id* devices,
cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_2; cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_int (CL_API_CALL * clGetDeviceIDsFromVA_APIMediaAdapterINTEL_fn)( typedef cl_int (CL_API_CALL * clGetDeviceIDsFromVA_APIMediaAdapterINTEL_fn)(
cl_platform_id platform, cl_platform_id platform,
cl_va_api_device_source_intel media_adapter_type, cl_va_api_device_source_intel media_adapter_type,
void* media_adapter, void* media_adapter,
cl_va_api_device_set_intel media_adapter_set, cl_va_api_device_set_intel media_adapter_set,
cl_uint num_entries, cl_uint num_entries,
cl_device_id* devices, cl_device_id* devices,
cl_uint* num_devices) CL_EXT_SUFFIX__VERSION_1_2; cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_mem CL_API_CALL extern CL_API_ENTRY cl_mem CL_API_CALL
clCreateFromVA_APIMediaSurfaceINTEL( clCreateFromVA_APIMediaSurfaceINTEL(
...@@ -85,14 +85,14 @@ clCreateFromVA_APIMediaSurfaceINTEL( ...@@ -85,14 +85,14 @@ clCreateFromVA_APIMediaSurfaceINTEL(
cl_mem_flags flags, cl_mem_flags flags,
VASurfaceID* surface, VASurfaceID* surface,
cl_uint plane, cl_uint plane,
cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2; cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_mem (CL_API_CALL * clCreateFromVA_APIMediaSurfaceINTEL_fn)( typedef cl_mem (CL_API_CALL * clCreateFromVA_APIMediaSurfaceINTEL_fn)(
cl_context context, cl_context context,
cl_mem_flags flags, cl_mem_flags flags,
VASurfaceID* surface, VASurfaceID* surface,
cl_uint plane, cl_uint plane,
cl_int* errcode_ret) CL_EXT_SUFFIX__VERSION_1_2; cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueAcquireVA_APIMediaSurfacesINTEL( clEnqueueAcquireVA_APIMediaSurfacesINTEL(
...@@ -101,15 +101,15 @@ clEnqueueAcquireVA_APIMediaSurfacesINTEL( ...@@ -101,15 +101,15 @@ clEnqueueAcquireVA_APIMediaSurfacesINTEL(
const cl_mem* mem_objects, const cl_mem* mem_objects,
cl_uint num_events_in_wait_list, cl_uint num_events_in_wait_list,
const cl_event* event_wait_list, const cl_event* event_wait_list,
cl_event* event) CL_EXT_SUFFIX__VERSION_1_2; cl_event* event) CL_API_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireVA_APIMediaSurfacesINTEL_fn)( typedef cl_int (CL_API_CALL *clEnqueueAcquireVA_APIMediaSurfacesINTEL_fn)(
cl_command_queue command_queue, cl_command_queue command_queue,
cl_uint num_objects, cl_uint num_objects,
const cl_mem* mem_objects, const cl_mem* mem_objects,
cl_uint num_events_in_wait_list, cl_uint num_events_in_wait_list,
const cl_event* event_wait_list, const cl_event* event_wait_list,
cl_event* event) CL_EXT_SUFFIX__VERSION_1_2; cl_event* event) CL_API_SUFFIX__VERSION_1_2;
extern CL_API_ENTRY cl_int CL_API_CALL extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueReleaseVA_APIMediaSurfacesINTEL( clEnqueueReleaseVA_APIMediaSurfacesINTEL(
...@@ -118,15 +118,15 @@ clEnqueueReleaseVA_APIMediaSurfacesINTEL( ...@@ -118,15 +118,15 @@ clEnqueueReleaseVA_APIMediaSurfacesINTEL(
const cl_mem* mem_objects, const cl_mem* mem_objects,
cl_uint num_events_in_wait_list, cl_uint num_events_in_wait_list,
const cl_event* event_wait_list, const cl_event* event_wait_list,
cl_event* event) CL_EXT_SUFFIX__VERSION_1_2; cl_event* event) CL_API_SUFFIX__VERSION_1_2;
typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseVA_APIMediaSurfacesINTEL_fn)( typedef cl_int (CL_API_CALL *clEnqueueReleaseVA_APIMediaSurfacesINTEL_fn)(
cl_command_queue command_queue, cl_command_queue command_queue,
cl_uint num_objects, cl_uint num_objects,
const cl_mem* mem_objects, const cl_mem* mem_objects,
cl_uint num_events_in_wait_list, cl_uint num_events_in_wait_list,
const cl_event* event_wait_list, const cl_event* event_wait_list,
cl_event* event) CL_EXT_SUFFIX__VERSION_1_2; cl_event* event) CL_API_SUFFIX__VERSION_1_2;
#ifdef __cplusplus #ifdef __cplusplus
} }
......
include/CL/opencl.h
...@@ -22,8 +22,8 @@ extern "C" { ...@@ -22,8 +22,8 @@ extern "C" {
#endif #endif
#include <CL/cl.h> #include <CL/cl.h>
#include <CL/cl_ext.h>
#include <CL/cl_gl.h> #include <CL/cl_gl.h>
#include <CL/cl_ext.h>
#ifdef __cplusplus #ifdef __cplusplus
} }
......
include/angle_cl.h
...@@ -10,10 +10,6 @@ ...@@ -10,10 +10,6 @@
#ifndef ANGLECL_H_ #ifndef ANGLECL_H_
#define ANGLECL_H_ #define ANGLECL_H_
// Workaround: The OpenCL headers use 'intptr_t' but don't include 'stdint.h' on Windows.
// TODO(jplate): Remove after the CL headers are fixed.
#include <stdint.h>
#define CL_TARGET_OPENCL_VERSION 300 #define CL_TARGET_OPENCL_VERSION 300
#define CL_USE_DEPRECATED_OPENCL_1_0_APIS #define CL_USE_DEPRECATED_OPENCL_1_0_APIS
#define CL_USE_DEPRECATED_OPENCL_1_1_APIS #define CL_USE_DEPRECATED_OPENCL_1_1_APIS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment