EGL: sync files with Khronos

Signed-off-by: Simon Zeni <simon.zeni@collabora.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25996>
This commit is contained in:
Simon Zeni 2023-12-19 09:36:20 -05:00 committed by Marge Bot
parent db5ddf1c2e
commit 73603c19c5
5 changed files with 97 additions and 9 deletions

View File

@ -14,7 +14,7 @@ extern "C" {
** used to make the header, and the header can be found at ** used to make the header, and the header can be found at
** http://www.khronos.org/registry/egl ** http://www.khronos.org/registry/egl
** **
** Khronos $Git commit SHA1: 6fb1daea15 $ on $Git commit date: 2022-05-25 09:41:13 -0600 $ ** Khronos $Git commit SHA1: f4cc936b88 $ on $Git commit date: 2023-12-16 01:21:49 -0500 $
*/ */
#include <EGL/eglplatform.h> #include <EGL/eglplatform.h>
@ -23,7 +23,7 @@ extern "C" {
#define EGL_EGL_PROTOTYPES 1 #define EGL_EGL_PROTOTYPES 1
#endif #endif
/* Generated on date 20220525 */ /* Generated on date 20231215 */
/* Generated C header for: /* Generated C header for:
* API: egl * API: egl

View File

@ -14,12 +14,12 @@ extern "C" {
** used to make the header, and the header can be found at ** used to make the header, and the header can be found at
** http://www.khronos.org/registry/egl ** http://www.khronos.org/registry/egl
** **
** Khronos $Git commit SHA1: 6fb1daea15 $ on $Git commit date: 2022-05-25 09:41:13 -0600 $ ** Khronos $Git commit SHA1: f4cc936b88 $ on $Git commit date: 2023-12-16 01:21:49 -0500 $
*/ */
#include <EGL/eglplatform.h> #include <EGL/eglplatform.h>
#define EGL_EGLEXT_VERSION 20220525 #define EGL_EGLEXT_VERSION 20231215
/* Generated C header for: /* Generated C header for:
* API: egl * API: egl
@ -727,6 +727,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDeviceBinaryEXT (EGLDeviceEXT device, EGLi
#define EGL_EXT_explicit_device 1 #define EGL_EXT_explicit_device 1
#endif /* EGL_EXT_explicit_device */ #endif /* EGL_EXT_explicit_device */
#ifndef EGL_EXT_gl_colorspace_bt2020_hlg
#define EGL_EXT_gl_colorspace_bt2020_hlg 1
#define EGL_GL_COLORSPACE_BT2020_HLG_EXT 0x3540
#endif /* EGL_EXT_gl_colorspace_bt2020_hlg */
#ifndef EGL_EXT_gl_colorspace_bt2020_linear #ifndef EGL_EXT_gl_colorspace_bt2020_linear
#define EGL_EXT_gl_colorspace_bt2020_linear 1 #define EGL_EXT_gl_colorspace_bt2020_linear 1
#define EGL_GL_COLORSPACE_BT2020_LINEAR_EXT 0x333F #define EGL_GL_COLORSPACE_BT2020_LINEAR_EXT 0x333F
@ -923,6 +928,10 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT (EGLDisplay dpy,
#define EGL_EXT_protected_surface 1 #define EGL_EXT_protected_surface 1
#endif /* EGL_EXT_protected_surface */ #endif /* EGL_EXT_protected_surface */
#ifndef EGL_EXT_query_reset_notification_strategy
#define EGL_EXT_query_reset_notification_strategy 1
#endif /* EGL_EXT_query_reset_notification_strategy */
#ifndef EGL_EXT_stream_consumer_egloutput #ifndef EGL_EXT_stream_consumer_egloutput
#define EGL_EXT_stream_consumer_egloutput 1 #define EGL_EXT_stream_consumer_egloutput 1
typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMEROUTPUTEXTPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLOutputLayerEXT layer); typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMEROUTPUTEXTPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLOutputLayerEXT layer);
@ -1223,6 +1232,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamReleaseImageNV (EGLDisplay dpy, EGLStream
#endif #endif
#endif /* EGL_NV_stream_consumer_eglimage */ #endif /* EGL_NV_stream_consumer_eglimage */
#ifndef EGL_NV_stream_consumer_eglimage_use_scanout_attrib
#define EGL_NV_stream_consumer_eglimage_use_scanout_attrib 1
#define EGL_STREAM_CONSUMER_IMAGE_USE_SCANOUT_NV 0x3378
#endif /* EGL_NV_stream_consumer_eglimage_use_scanout_attrib */
#ifndef EGL_NV_stream_consumer_gltexture_yuv #ifndef EGL_NV_stream_consumer_gltexture_yuv
#define EGL_NV_stream_consumer_gltexture_yuv 1 #define EGL_NV_stream_consumer_gltexture_yuv 1
#define EGL_YUV_PLANE0_TEXTURE_UNIT_NV 0x332C #define EGL_YUV_PLANE0_TEXTURE_UNIT_NV 0x332C
@ -1432,6 +1446,16 @@ EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void);
#define EGL_TRIPLE_BUFFER_NV 0x3230 #define EGL_TRIPLE_BUFFER_NV 0x3230
#endif /* EGL_NV_triple_buffer */ #endif /* EGL_NV_triple_buffer */
#ifndef EGL_QNX_image_native_buffer
#define EGL_QNX_image_native_buffer 1
#define EGL_NATIVE_BUFFER_QNX 0x3551
#endif /* EGL_QNX_image_native_buffer */
#ifndef EGL_QNX_platform_screen
#define EGL_QNX_platform_screen 1
#define EGL_PLATFORM_SCREEN_QNX 0x3550
#endif /* EGL_QNX_platform_screen */
#ifndef EGL_TIZEN_image_native_buffer #ifndef EGL_TIZEN_image_native_buffer
#define EGL_TIZEN_image_native_buffer 1 #define EGL_TIZEN_image_native_buffer 1
#define EGL_NATIVE_BUFFER_TIZEN 0x32A0 #define EGL_NATIVE_BUFFER_TIZEN 0x32A0

View File

@ -134,6 +134,7 @@
#define EGL_ANGLE_platform_angle_device_id #define EGL_ANGLE_platform_angle_device_id
#define EGL_PLATFORM_ANGLE_DEVICE_ID_HIGH_ANGLE 0x34D6 #define EGL_PLATFORM_ANGLE_DEVICE_ID_HIGH_ANGLE 0x34D6
#define EGL_PLATFORM_ANGLE_DEVICE_ID_LOW_ANGLE 0x34D7 #define EGL_PLATFORM_ANGLE_DEVICE_ID_LOW_ANGLE 0x34D7
#define EGL_PLATFORM_ANGLE_DISPLAY_KEY_ANGLE 0x34DC
#endif /* EGL_ANGLE_platform_angle_device_id */ #endif /* EGL_ANGLE_platform_angle_device_id */
#ifndef EGL_ANGLE_x11_visual #ifndef EGL_ANGLE_x11_visual
@ -291,6 +292,14 @@ EGLAPI void EGLAPIENTRY eglForceGPUSwitchANGLE(EGLDisplay dpy, EGLint gpuIDHigh,
#endif #endif
#endif /* EGL_ANGLE_power_preference */ #endif /* EGL_ANGLE_power_preference */
#ifndef EGL_ANGLE_wait_until_work_scheduled
#define EGL_ANGLE_wait_until_work_scheduled 1
typedef void(EGLAPIENTRYP PFNEGLWAITUNTILWORKSCHEDULEDANGLEPROC) (EGLDisplay dpy);
#ifdef EGL_EGLEXT_PROTOTYPES
EGLAPI void EGLAPIENTRY eglWaitUntilWorkScheduledANGLE(EGLDisplay dpy);
#endif
#endif /* EGL_ANGLE_wait_until_work_scheduled */
#ifndef EGL_ANGLE_feature_control #ifndef EGL_ANGLE_feature_control
#define EGL_ANGLE_feature_control 1 #define EGL_ANGLE_feature_control 1
#define EGL_FEATURE_NAME_ANGLE 0x3460 #define EGL_FEATURE_NAME_ANGLE 0x3460
@ -368,7 +377,12 @@ EGLAPI EGLBoolean EGLAPIENTRY eglPrepareSwapBuffersANGLE(EGLDisplay dpy, EGLSurf
#define EGL_ANGLE_external_context_and_surface 1 #define EGL_ANGLE_external_context_and_surface 1
#define EGL_EXTERNAL_CONTEXT_ANGLE 0x348E #define EGL_EXTERNAL_CONTEXT_ANGLE 0x348E
#define EGL_EXTERNAL_SURFACE_ANGLE 0x348F #define EGL_EXTERNAL_SURFACE_ANGLE 0x348F
#define EGL_EXTERNAL_CONTEXT_SAVE_STATE_ANGLE 0x3490 typedef void (EGLAPIENTRYP PFNEGLACQUIREEXTERNALCONTEXTANGLEPROC) (EGLDisplay dpy, EGLSurface readAndDraw);
typedef void (EGLAPIENTRYP PFNEGLRELEASEEXTERNALCONTEXTANGLEPROC) (EGLDisplay dpy);
#ifdef EGL_EGLEXT_PROTOTYPES
EGLAPI void EGLAPIENTRY eglAcquireExternalContextANGLE(EGLDisplay dpy, EGLSurface drawAndRead);
EGLAPI void EGLAPIENTRY eglReleaseExternalContextANGLE(EGLDisplay dpy);
#endif
#endif /* EGL_ANGLE_external_context_and_surface */ #endif /* EGL_ANGLE_external_context_and_surface */
#ifndef EGL_ANGLE_create_surface_swap_interval #ifndef EGL_ANGLE_create_surface_swap_interval
@ -396,6 +410,9 @@ EGLAPI EGLBoolean EGLAPIENTRY eglPrepareSwapBuffersANGLE(EGLDisplay dpy, EGLSurf
#define EGL_VULKAN_IMAGE_CREATE_INFO_HI_ANGLE 0x34D4 #define EGL_VULKAN_IMAGE_CREATE_INFO_HI_ANGLE 0x34D4
#define EGL_VULKAN_IMAGE_CREATE_INFO_LO_ANGLE 0x34D5 #define EGL_VULKAN_IMAGE_CREATE_INFO_LO_ANGLE 0x34D5
typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTVKIMAGEANGLEPROC)(EGLDisplay dpy, EGLImage image, void* vk_image, void* vk_image_create_info); typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTVKIMAGEANGLEPROC)(EGLDisplay dpy, EGLImage image, void* vk_image, void* vk_image_create_info);
#ifdef EGL_EGLEXT_PROTOTYPES
EGLAPI EGLBoolean EGLAPIENTRY eglExportVkImageANGLE(EGLDisplay dpy, EGLImage image, void* vk_image, void* vk_image_create_info);
#endif
#endif /* EGL_ANGLE_vulkan_image */ #endif /* EGL_ANGLE_vulkan_image */
#ifndef EGL_ANGLE_metal_shared_event_sync #ifndef EGL_ANGLE_metal_shared_event_sync
@ -404,7 +421,11 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTVKIMAGEANGLEPROC)(EGLDisplay dpy, E
#define EGL_SYNC_METAL_SHARED_EVENT_OBJECT_ANGLE 0x34D9 #define EGL_SYNC_METAL_SHARED_EVENT_OBJECT_ANGLE 0x34D9
#define EGL_SYNC_METAL_SHARED_EVENT_SIGNAL_VALUE_LO_ANGLE 0x34DA #define EGL_SYNC_METAL_SHARED_EVENT_SIGNAL_VALUE_LO_ANGLE 0x34DA
#define EGL_SYNC_METAL_SHARED_EVENT_SIGNAL_VALUE_HI_ANGLE 0x34DB #define EGL_SYNC_METAL_SHARED_EVENT_SIGNAL_VALUE_HI_ANGLE 0x34DB
typedef void* (EGLAPIENTRYP PFNEGLCOPYMETALSHAREDEVENTANGLEPROC)(EGLDisplay dpy, EGLSyncKHR sync); #define EGL_SYNC_METAL_SHARED_EVENT_SIGNALED_ANGLE 0x34DC
typedef void* (EGLAPIENTRYP PFNEGLCOPYMETALSHAREDEVENTANGLEPROC)(EGLDisplay dpy, EGLSync sync);
#ifdef EGL_EGLEXT_PROTOTYPES
EGLAPI void *EGLAPIENTRY eglCopyMetalSharedEventANGLE(EGLDisplay dpy, EGLSync sync);
#endif
#endif /* EGL_ANGLE_metal_shared_event_sync */ #endif /* EGL_ANGLE_metal_shared_event_sync */
// clang-format on // clang-format on

View File

@ -64,6 +64,12 @@ typedef HDC EGLNativeDisplayType;
typedef HBITMAP EGLNativePixmapType; typedef HBITMAP EGLNativePixmapType;
typedef HWND EGLNativeWindowType; typedef HWND EGLNativeWindowType;
#elif defined(__QNX__)
typedef khronos_uintptr_t EGLNativeDisplayType;
typedef struct _screen_pixmap* EGLNativePixmapType; /* screen_pixmap_t */
typedef struct _screen_window* EGLNativeWindowType; /* screen_window_t */
#elif defined(__EMSCRIPTEN__) #elif defined(__EMSCRIPTEN__)
typedef int EGLNativeDisplayType; typedef int EGLNativeDisplayType;

View File

@ -885,7 +885,8 @@
<enum value="0x3375" name="EGL_STREAM_IMAGE_REMOVE_NV"/> <enum value="0x3375" name="EGL_STREAM_IMAGE_REMOVE_NV"/>
<enum value="0x3376" name="EGL_STREAM_IMAGE_AVAILABLE_NV"/> <enum value="0x3376" name="EGL_STREAM_IMAGE_AVAILABLE_NV"/>
<enum value="0x3377" name="EGL_DRM_RENDER_NODE_FILE_EXT"/> <enum value="0x3377" name="EGL_DRM_RENDER_NODE_FILE_EXT"/>
<unused start="0x3378" end="0x339F"/> <enum value="0x3378" name="EGL_STREAM_CONSUMER_IMAGE_USE_SCANOUT_NV" />
<unused start="0x3379" end="0x339F"/>
</enums> </enums>
<enums namespace="EGL" start="0x33A0" end="0x33AF" vendor="ANGLE" comment="Reserved for Shannon Woods (Bug 13175)"> <enums namespace="EGL" start="0x33A0" end="0x33AF" vendor="ANGLE" comment="Reserved for Shannon Woods (Bug 13175)">
@ -1073,6 +1074,21 @@
<unused start="0x3531" end="0x353F"/> <unused start="0x3531" end="0x353F"/>
</enums> </enums>
<enums namespace="EGL" start="0x3540" end="0x354F" vendor="EXT" comment="Reserved for Chris Glover (EGL_EXT_gl_colorspace_bt2020)">
<enum value="0x3540" name="EGL_GL_COLORSPACE_BT2020_HLG_EXT"/>
<unused start="0x3541" end="0x354F"/>
</enums>
<enums namespace="EGL" start="0x3550" end="0x355F" vendor="QNX" comment="Reserved for Mike Gorchak of QNX (QNX platform and native buffer)">
<enum value="0x3550" name="EGL_PLATFORM_SCREEN_QNX"/>
<enum value="0x3551" name="EGL_NATIVE_BUFFER_QNX"/>
<unused start="0x3552" end="0x355F"/>
</enums>
<enums namespace="EGL" start="0x3560" end="0x356F" vendor="SAMSUNG" comment="Reserved for Jeff Vigil of Samsung (private extensions)">
<unused start="0x3560" end="0x356F"/>
</enums>
<!-- Please remember that new enumerant allocations must be obtained by <!-- Please remember that new enumerant allocations must be obtained by
request to the Khronos API registrar (see comments at the top of this request to the Khronos API registrar (see comments at the top of this
file) File requests in the Khronos Bugzilla, EGL project, Registry file) File requests in the Khronos Bugzilla, EGL project, Registry
@ -1082,8 +1098,8 @@
<!-- Reservable for future use. To generate a new range, allocate multiples <!-- Reservable for future use. To generate a new range, allocate multiples
of 16 starting at the lowest available point in this block. --> of 16 starting at the lowest available point in this block. -->
<enums namespace="EGL" start="0x3540" end="0x3FFF" vendor="KHR" comment="Reserved for future use"> <enums namespace="EGL" start="0x3570" end="0x3FFF" vendor="KHR" comment="Reserved for future use">
<unused start="0x3540" end="0x3FFF"/> <unused start="0x3570" end="0x3FFF"/>
</enums> </enums>
<enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL."> <enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL.">
@ -2496,6 +2512,11 @@
<command name="eglQueryDisplayAttribEXT"/> <command name="eglQueryDisplayAttribEXT"/>
</require> </require>
</extension> </extension>
<extension name="EGL_EXT_gl_colorspace_bt2020_hlg" supported="egl">
<require>
<enum name="EGL_GL_COLORSPACE_BT2020_HLG_EXT"/>
</require>
</extension>
<extension name="EGL_EXT_gl_colorspace_bt2020_linear" supported="egl"> <extension name="EGL_EXT_gl_colorspace_bt2020_linear" supported="egl">
<require> <require>
<enum name="EGL_GL_COLORSPACE_BT2020_LINEAR_EXT"/> <enum name="EGL_GL_COLORSPACE_BT2020_LINEAR_EXT"/>
@ -2668,6 +2689,7 @@
<enum name="EGL_PROTECTED_CONTENT_EXT"/> <enum name="EGL_PROTECTED_CONTENT_EXT"/>
</require> </require>
</extension> </extension>
<extension name="EGL_EXT_query_reset_notification_strategy" supported="egl"/>
<extension name="EGL_EXT_stream_consumer_egloutput" supported="egl"> <extension name="EGL_EXT_stream_consumer_egloutput" supported="egl">
<require> <require>
<command name="eglStreamConsumerOutputEXT"/> <command name="eglStreamConsumerOutputEXT"/>
@ -3533,5 +3555,20 @@
<enum name="EGL_DEVICE_EXT"/> <enum name="EGL_DEVICE_EXT"/>
</require> </require>
</extension> </extension>
<extension name="EGL_NV_stream_consumer_eglimage_use_scanout_attrib" supported="egl">
<require>
<enum name="EGL_STREAM_CONSUMER_IMAGE_USE_SCANOUT_NV"/>
</require>
</extension>
<extension name="EGL_QNX_platform_screen" supported="egl">
<require>
<enum name="EGL_PLATFORM_SCREEN_QNX"/>
</require>
</extension>
<extension name="EGL_QNX_image_native_buffer" supported="egl">
<require>
<enum name="EGL_NATIVE_BUFFER_QNX"/>
</require>
</extension>
</extensions> </extensions>
</registry> </registry>