diff options
| author | Ben Ashbaugh <ben.ashbaugh@intel.com> | 2023-09-15 18:01:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-15 18:01:26 -0700 |
| commit | 10aaadf55d582934661ca9d66956696cf1d836dc (patch) | |
| tree | 6244f7122d0db1b370bbe256ed1dc531bc050657 | |
| parent | 489ba7af868740b82a78c294ba222b6c649d008e (diff) | |
| download | OpenCL-Headers-10aaadf55d582934661ca9d66956696cf1d836dc.tar.gz | |
fix the OpenCL version for the CL_DEPTH enum (#231)
also fix CL_DEPTH_STENCIL and CL_UNORM_INT24, which were never core enums
| -rw-r--r-- | CL/cl.h | 8 | ||||
| -rw-r--r-- | CL/cl_ext.h | 6 | ||||
| -rw-r--r-- | CL/cl_gl.h | 10 |
3 files changed, 6 insertions, 18 deletions
@@ -569,11 +569,8 @@ typedef struct _cl_name_version { #define CL_RGx 0x10BB #define CL_RGBx 0x10BC #endif -#ifdef CL_VERSION_1_2 -#define CL_DEPTH 0x10BD -#define CL_DEPTH_STENCIL 0x10BE -#endif #ifdef CL_VERSION_2_0 +#define CL_DEPTH 0x10BD #define CL_sRGB 0x10BF #define CL_sRGBx 0x10C0 #define CL_sRGBA 0x10C1 @@ -597,9 +594,6 @@ typedef struct _cl_name_version { #define CL_UNSIGNED_INT32 0x10DC #define CL_HALF_FLOAT 0x10DD #define CL_FLOAT 0x10DE -#ifdef CL_VERSION_1_2 -#define CL_UNORM_INT24 0x10DF -#endif #ifdef CL_VERSION_2_1 #define CL_UNORM_INT_101010_2 0x10E0 #endif diff --git a/CL/cl_ext.h b/CL/cl_ext.h index 91bc5a4..66fa3e9 100644 --- a/CL/cl_ext.h +++ b/CL/cl_ext.h @@ -3437,11 +3437,11 @@ clGetICDLoaderInfoOCLICD( #define CL_KHR_DEPTH_IMAGES_EXTENSION_NAME \ "cl_khr_depth_images" -#if !defined(CL_VERSION_1_2) -/* cl_channel_order - defined in CL.h for OpenCL 1.2 (?) and newer */ +#if !defined(CL_VERSION_2_0) +/* cl_channel_order - defined in CL.h for OpenCL 2.0 and newer */ #define CL_DEPTH 0x10BD -#endif /* !defined(CL_VERSION_1_2) */ +#endif /* !defined(CL_VERSION_2_0) */ /*************************************************************** * cl_ext_float_atomics @@ -345,18 +345,12 @@ clCreateEventFromGLsyncKHR( #define CL_KHR_GL_DEPTH_IMAGES_EXTENSION_NAME \ "cl_khr_gl_depth_images" -#if !defined(CL_VERSION_1_2) -/* cl_channel_order - defined in CL.h for OpenCL 1.2 and newer */ +/* cl_channel_order */ #define CL_DEPTH_STENCIL 0x10BE -#endif /* !defined(CL_VERSION_1_2) */ - -#if !defined(CL_VERSION_1_2) -/* cl_channel_type - defined in CL.h for OpenCL 1.2 and newer */ +/* cl_channel_type */ #define CL_UNORM_INT24 0x10DF -#endif /* !defined(CL_VERSION_1_2) */ - /*************************************************************** * cl_khr_gl_msaa_sharing ***************************************************************/ |