Skip to content

Commit

Permalink
Update generated headers and remove CL/GL types from cl_platform.h (K…
Browse files Browse the repository at this point in the history
…hronosGroup#257)

- Move CL/GL type declarations from cl_platform.h to cl_gl.h
- Include version macros for extensions

Signed-off-by: Kevin Petit <kevin.petit@arm.com>
  • Loading branch information
kpet authored Jul 11, 2024
1 parent f6f5aa5 commit d79beab
Show file tree
Hide file tree
Showing 9 changed files with 98 additions and 90 deletions.
6 changes: 6 additions & 0 deletions CL/cl_d3d10.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ extern "C" {
#define CL_KHR_D3D10_SHARING_EXTENSION_NAME \
"cl_khr_d3d10_sharing"


#define CL_KHR_D3D10_SHARING_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)

typedef cl_uint cl_d3d10_device_source_khr;
typedef cl_uint cl_d3d10_device_set_khr;

Expand Down Expand Up @@ -228,6 +231,9 @@ clEnqueueReleaseD3D10ObjectsKHR(
#define CL_INTEL_SHARING_FORMAT_QUERY_D3D10_EXTENSION_NAME \
"cl_intel_sharing_format_query_d3d10"


#define CL_INTEL_SHARING_FORMAT_QUERY_D3D10_EXTENSION_VERSION CL_MAKE_VERSION(0, 0, 0)

/* when cl_khr_d3d10_sharing is supported */

typedef cl_int CL_API_CALL
Expand Down
6 changes: 6 additions & 0 deletions CL/cl_d3d11.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ extern "C" {
#define CL_KHR_D3D11_SHARING_EXTENSION_NAME \
"cl_khr_d3d11_sharing"


#define CL_KHR_D3D11_SHARING_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)

typedef cl_uint cl_d3d11_device_source_khr;
typedef cl_uint cl_d3d11_device_set_khr;

Expand Down Expand Up @@ -228,6 +231,9 @@ clEnqueueReleaseD3D11ObjectsKHR(
#define CL_INTEL_SHARING_FORMAT_QUERY_D3D11_EXTENSION_NAME \
"cl_intel_sharing_format_query_d3d11"


#define CL_INTEL_SHARING_FORMAT_QUERY_D3D11_EXTENSION_VERSION CL_MAKE_VERSION(0, 0, 0)

/* when cl_khr_d3d11_sharing is supported */

typedef cl_int CL_API_CALL
Expand Down
9 changes: 9 additions & 0 deletions CL/cl_dx9_media_sharing.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ extern "C" {
#define CL_KHR_DX9_MEDIA_SHARING_EXTENSION_NAME \
"cl_khr_dx9_media_sharing"


#define CL_KHR_DX9_MEDIA_SHARING_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)

typedef cl_uint cl_dx9_media_adapter_type_khr;
typedef cl_uint cl_dx9_media_adapter_set_khr;

Expand Down Expand Up @@ -209,6 +212,9 @@ clEnqueueReleaseDX9MediaSurfacesKHR(
#define CL_INTEL_DX9_MEDIA_SHARING_EXTENSION_NAME \
"cl_intel_dx9_media_sharing"


#define CL_INTEL_DX9_MEDIA_SHARING_EXTENSION_VERSION CL_MAKE_VERSION(0, 0, 0)

typedef cl_uint cl_dx9_device_source_intel;
typedef cl_uint cl_dx9_device_set_intel;

Expand Down Expand Up @@ -341,6 +347,9 @@ clEnqueueReleaseDX9ObjectsINTEL(
#define CL_INTEL_SHARING_FORMAT_QUERY_DX9_EXTENSION_NAME \
"cl_intel_sharing_format_query_dx9"


#define CL_INTEL_SHARING_FORMAT_QUERY_DX9_EXTENSION_VERSION CL_MAKE_VERSION(0, 0, 0)

/* when cl_khr_dx9_media_sharing or cl_intel_dx9_media_sharing is supported */

typedef cl_int CL_API_CALL
Expand Down
6 changes: 6 additions & 0 deletions CL/cl_egl.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ extern "C" {
#define CL_KHR_EGL_IMAGE_EXTENSION_NAME \
"cl_khr_egl_image"


#define CL_KHR_EGL_IMAGE_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)

/* Command type for events created with clEnqueueAcquireEGLObjectsKHR */
#define CL_COMMAND_EGL_FENCE_SYNC_OBJECT_KHR 0x202F
#define CL_COMMAND_ACQUIRE_EGL_OBJECTS_KHR 0x202D
Expand Down Expand Up @@ -144,6 +147,9 @@ clEnqueueReleaseEGLObjectsKHR(
#define CL_KHR_EGL_EVENT_EXTENSION_NAME \
"cl_khr_egl_event"


#define CL_KHR_EGL_EVENT_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)

/* CLeglDisplayKHR is an opaque handle to an EGLDisplay */
/* type CLeglDisplayKHR */

Expand Down
Loading

0 comments on commit d79beab

Please sign in to comment.