From 2eee03b7a11339159f9a1f6ef90259caea899048 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 31 Jul 2017 15:08:29 +0100 Subject: [PATCH] egl: Update headers from Khronos Taken from egl-registry 7d68647c4dab. Signed-off-by: Daniel Stone --- include/EGL/egl.h | 6 +- include/EGL/eglext.h | 73 ++++- include/KHR/khrplatform.h | 10 +- src/egl/generate/egl.xml | 626 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 673 insertions(+), 42 deletions(-) diff --git a/include/EGL/egl.h b/include/EGL/egl.h index 29f30d94de1..93a21873c0f 100644 --- a/include/EGL/egl.h +++ b/include/EGL/egl.h @@ -31,14 +31,14 @@ extern "C" { ** This header is generated from the Khronos OpenGL / OpenGL ES XML ** API Registry. The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/egl +** http://www.khronos.org/registry/egl ** -** Khronos $Revision$ on $Date$ +** Khronos $Git commit SHA1: a732b061e7 $ on $Git commit date: 2017-06-17 23:27:53 +0100 $ */ #include -/* Generated on date 20161230 */ +/* Generated on date 20170627 */ /* Generated C header for: * API: egl diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h index bc8f0bab23b..f7dc66884ee 100644 --- a/include/EGL/eglext.h +++ b/include/EGL/eglext.h @@ -31,14 +31,14 @@ extern "C" { ** This header is generated from the Khronos OpenGL / OpenGL ES XML ** API Registry. The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/egl +** http://www.khronos.org/registry/egl ** -** Khronos $Revision$ on $Date$ +** Khronos $Git commit SHA1: a732b061e7 $ on $Git commit date: 2017-06-17 23:27:53 +0100 $ */ #include -#define EGL_EGLEXT_VERSION 20161230 +#define EGL_EGLEXT_VERSION 20170627 /* Generated C header for: * API: egl @@ -133,6 +133,15 @@ EGLAPI EGLint EGLAPIENTRY eglLabelObjectKHR (EGLDisplay display, EGLenum objectT #endif #endif /* EGL_KHR_debug */ +#ifndef EGL_KHR_display_reference +#define EGL_KHR_display_reference 1 +#define EGL_TRACK_REFERENCES_KHR 0x3352 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDISPLAYATTRIBKHRPROC) (EGLDisplay dpy, EGLint name, EGLAttrib *value); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribKHR (EGLDisplay dpy, EGLint name, EGLAttrib *value); +#endif +#endif /* EGL_KHR_display_reference */ + #ifndef EGL_KHR_fence_sync #define EGL_KHR_fence_sync 1 typedef khronos_utime_nanoseconds_t EGLTimeKHR; @@ -555,6 +564,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu #define EGL_DISCARD_SAMPLES_ARM 0x3286 #endif /* EGL_ARM_pixmap_multisample_discard */ +#ifndef EGL_EXT_bind_to_front +#define EGL_EXT_bind_to_front 1 +#define EGL_FRONT_BUFFER_EXT 0x3464 +#endif /* EGL_EXT_bind_to_front */ + #ifndef EGL_EXT_buffer_age #define EGL_EXT_buffer_age 1 #define EGL_BUFFER_AGE_EXT 0x313D @@ -564,6 +578,30 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu #define EGL_EXT_client_extensions 1 #endif /* EGL_EXT_client_extensions */ +#ifndef EGL_EXT_compositor +#define EGL_EXT_compositor 1 +#define EGL_PRIMARY_COMPOSITOR_CONTEXT_EXT 0x3460 +#define EGL_EXTERNAL_REF_ID_EXT 0x3461 +#define EGL_COMPOSITOR_DROP_NEWEST_FRAME_EXT 0x3462 +#define EGL_COMPOSITOR_KEEP_NEWEST_FRAME_EXT 0x3463 +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETCONTEXTLISTEXTPROC) (const EGLint *external_ref_ids, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETCONTEXTATTRIBUTESEXTPROC) (EGLint external_ref_id, const EGLint *context_attributes, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETWINDOWLISTEXTPROC) (EGLint external_ref_id, const EGLint *external_win_ids, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETWINDOWATTRIBUTESEXTPROC) (EGLint external_win_id, const EGLint *window_attributes, EGLint num_entries); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORBINDTEXWINDOWEXTPROC) (EGLint external_win_id); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSETSIZEEXTPROC) (EGLint external_win_id, EGLint width, EGLint height); +typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOMPOSITORSWAPPOLICYEXTPROC) (EGLint external_win_id, EGLint policy); +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetContextListEXT (const EGLint *external_ref_ids, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetContextAttributesEXT (EGLint external_ref_id, const EGLint *context_attributes, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetWindowListEXT (EGLint external_ref_id, const EGLint *external_win_ids, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetWindowAttributesEXT (EGLint external_win_id, const EGLint *window_attributes, EGLint num_entries); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorBindTexWindowEXT (EGLint external_win_id); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSetSizeEXT (EGLint external_win_id, EGLint width, EGLint height); +EGLAPI EGLBoolean EGLAPIENTRY eglCompositorSwapPolicyEXT (EGLint external_win_id, EGLint policy); +#endif +#endif /* EGL_EXT_compositor */ + #ifndef EGL_EXT_create_context_robustness #define EGL_EXT_create_context_robustness 1 #define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT 0x30BF @@ -618,6 +656,21 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a #define EGL_GL_COLORSPACE_BT2020_PQ_EXT 0x3340 #endif /* EGL_EXT_gl_colorspace_bt2020_pq */ +#ifndef EGL_EXT_gl_colorspace_display_p3 +#define EGL_EXT_gl_colorspace_display_p3 1 +#define EGL_GL_COLORSPACE_DISPLAY_P3_EXT 0x3363 +#endif /* EGL_EXT_gl_colorspace_display_p3 */ + +#ifndef EGL_EXT_gl_colorspace_display_p3_linear +#define EGL_EXT_gl_colorspace_display_p3_linear 1 +#define EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT 0x3362 +#endif /* EGL_EXT_gl_colorspace_display_p3_linear */ + +#ifndef EGL_EXT_gl_colorspace_scrgb +#define EGL_EXT_gl_colorspace_scrgb 1 +#define EGL_GL_COLORSPACE_SCRGB_EXT 0x3351 +#endif /* EGL_EXT_gl_colorspace_scrgb */ + #ifndef EGL_EXT_gl_colorspace_scrgb_linear #define EGL_EXT_gl_colorspace_scrgb_linear 1 #define EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT 0x3350 @@ -670,6 +723,13 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDmaBufModifiersEXT (EGLDisplay dpy, EGLint #endif #endif /* EGL_EXT_image_dma_buf_import_modifiers */ +#ifndef EGL_EXT_image_implicit_sync_control +#define EGL_EXT_image_implicit_sync_control 1 +#define EGL_IMPORT_SYNC_TYPE_EXT 0x3470 +#define EGL_IMPORT_IMPLICIT_SYNC_EXT 0x3471 +#define EGL_IMPORT_EXPLICIT_SYNC_EXT 0x3472 +#endif /* EGL_EXT_image_implicit_sync_control */ + #ifndef EGL_EXT_multiview_window #define EGL_EXT_multiview_window 1 #define EGL_MULTIVIEW_VIEW_COUNT_EXT 0x3134 @@ -769,6 +829,12 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerOutputEXT (EGLDisplay dpy, EGLStr #endif #endif /* EGL_EXT_stream_consumer_egloutput */ +#ifndef EGL_EXT_surface_CTA861_3_metadata +#define EGL_EXT_surface_CTA861_3_metadata 1 +#define EGL_CTA861_3_MAX_CONTENT_LIGHT_LEVEL_EXT 0x3360 +#define EGL_CTA861_3_MAX_FRAME_AVERAGE_LEVEL_EXT 0x3361 +#endif /* EGL_EXT_surface_CTA861_3_metadata */ + #ifndef EGL_EXT_surface_SMPTE2086_metadata #define EGL_EXT_surface_SMPTE2086_metadata 1 #define EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT 0x3341 @@ -781,6 +847,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerOutputEXT (EGLDisplay dpy, EGLStr #define EGL_SMPTE2086_WHITE_POINT_Y_EXT 0x3348 #define EGL_SMPTE2086_MAX_LUMINANCE_EXT 0x3349 #define EGL_SMPTE2086_MIN_LUMINANCE_EXT 0x334A +#define EGL_METADATA_SCALING_EXT 50000 #endif /* EGL_EXT_surface_SMPTE2086_metadata */ #ifndef EGL_EXT_swap_buffers_with_damage diff --git a/include/KHR/khrplatform.h b/include/KHR/khrplatform.h index 790de44b8f6..93acb076a06 100644 --- a/include/KHR/khrplatform.h +++ b/include/KHR/khrplatform.h @@ -26,7 +26,7 @@ /* Khronos platform-specific types and definitions. * - * $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ + * $Revision: 32517 $ on $Date: 2016-03-11 02:41:19 -0800 (Fri, 11 Mar 2016) $ * * Adopters may modify this file to suit their platform. Adopters are * encouraged to submit platform specific modifications to the Khronos @@ -98,11 +98,7 @@ * This precedes the return type of the function in the function prototype. */ #if defined(_WIN32) && !defined(__SCITECH_SNAP__) -# if defined(KHRONOS_DLL_EXPORTS) -# define KHRONOS_APICALL __declspec(dllexport) -# else -# define KHRONOS_APICALL __declspec(dllimport) -# endif +# define KHRONOS_APICALL __declspec(dllimport) #elif defined (__SYMBIAN32__) # define KHRONOS_APICALL IMPORT_C #elif (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303) \ @@ -231,7 +227,7 @@ typedef signed short int khronos_int16_t; typedef unsigned short int khronos_uint16_t; /* - * Types that differ between LLP64 and LP64 architectures - in LLP64, + * Types that differ between LLP64 and LP64 architectures - in LLP64, * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears * to be the only LLP64 architecture in current use. */ diff --git a/src/egl/generate/egl.xml b/src/egl/generate/egl.xml index f6dbbc0f269..9250f93118b 100644 --- a/src/egl/generate/egl.xml +++ b/src/egl/generate/egl.xml @@ -1,7 +1,7 @@ @@ -76,6 +76,7 @@ typedef khronos_utime_nanoseconds_t EGLTimeNV; typedef khronos_utime_nanoseconds_t EGLuint64NV; typedef khronos_uint64_t EGLuint64KHR; + typedef khronos_stime_nanoseconds_t EGLnsecsANDROID; typedef int EGLNativeFileDescriptorKHR; typedef khronos_ssize_t EGLsizeiANDROID; typedef void (*EGLSetBlobFuncANDROID) (const void *key, EGLsizeiANDROID keySize, const void *value, EGLsizeiANDROID valueSize); @@ -112,6 +113,7 @@ + @@ -130,6 +132,12 @@ + + + + + + @@ -165,7 +173,11 @@ tokens are reused for different purposes in different extensions and API versions). --> - + + + + + @@ -173,24 +185,25 @@ - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -356,7 +369,7 @@ - + @@ -441,7 +454,10 @@ - + + + + @@ -474,12 +490,14 @@ - + - + + + @@ -532,7 +550,9 @@ - + + + @@ -605,7 +625,37 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -636,7 +686,9 @@ - + + + @@ -699,7 +751,51 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -733,6 +829,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -835,6 +969,10 @@ EGLClientBuffer buffer const EGLint *attrib_list + + EGLClientBuffer eglCreateNativeClientBufferANDROID + const EGLint *attrib_list + EGLSurface eglCreatePbufferFromClientBuffer EGLDisplay dpy @@ -900,6 +1038,11 @@ EGLDisplay dpy const EGLint *attrib_list + + EGLStreamKHR eglCreateStreamAttribKHR + EGLDisplay dpy + const EGLAttrib *attrib_list + EGLSurface eglCreateStreamProducerSurfaceKHR EGLDisplay dpy @@ -1162,6 +1305,12 @@ EGLint width EGLint height + + EGLBoolean eglPresentationTimeANDROID + EGLDisplay dpy + EGLSurface surface + EGLnsecsANDROID time + EGLenum eglQueryAPI @@ -1199,6 +1348,36 @@ EGLDisplay dpy EGLint attribute EGLAttrib *value + + + + EGLBoolean eglQueryDisplayAttribKHR + EGLDisplay dpy + EGLint name + EGLAttrib *value + + + EGLBoolean eglQueryDisplayAttribNV + EGLDisplay dpy + EGLint attribute + EGLAttrib *value + + + + EGLBoolean eglQueryDmaBufFormatsEXT + EGLDisplay dpy + EGLint max_formats + EGLint *formats + EGLint *num_formats + + + EGLBoolean eglQueryDmaBufModifiersEXT + EGLDisplay dpy + EGLint format + EGLint max_modifiers + EGLuint64KHR *modifiers + EGLBoolean *external_only + EGLint *num_modifiers EGLBoolean eglQueryNativeDisplayNV @@ -1250,6 +1429,23 @@ EGLenum attribute EGLint *value + + EGLBoolean eglQueryStreamAttribKHR + EGLDisplay dpy + EGLStreamKHR stream + EGLenum attribute + EGLAttrib *value + + + EGLBoolean eglQueryStreamMetadataNV + EGLDisplay dpy + EGLStreamKHR stream + EGLenum name + EGLint n + EGLint offset + EGLint size + void *data + EGLBoolean eglQueryStreamTimeKHR EGLDisplay dpy @@ -1299,6 +1495,11 @@ EGLBoolean eglReleaseThread + + EGLBoolean eglResetStreamNV + EGLDisplay dpy + EGLStreamKHR stream + void eglSetBlobCacheFuncsANDROID EGLDisplay dpy @@ -1312,6 +1513,22 @@ EGLint *rects EGLint n_rects + + EGLBoolean eglSetStreamAttribKHR + EGLDisplay dpy + EGLStreamKHR stream + EGLenum attribute + EGLAttrib value + + + EGLBoolean eglSetStreamMetadataNV + EGLDisplay dpy + EGLStreamKHR stream + EGLint n + EGLint offset + EGLint size + const void *data + EGLBoolean eglSignalSyncKHR EGLDisplay dpy @@ -1335,11 +1552,23 @@ EGLDisplay dpy EGLStreamKHR stream + + EGLBoolean eglStreamConsumerAcquireAttribKHR + EGLDisplay dpy + EGLStreamKHR stream + const EGLAttrib *attrib_list + EGLBoolean eglStreamConsumerGLTextureExternalKHR EGLDisplay dpy EGLStreamKHR stream + + EGLBoolean eglStreamConsumerGLTextureExternalAttribsNV + EGLDisplay dpy + EGLStreamKHR stream + EGLAttrib *attrib_list + EGLBoolean eglStreamConsumerOutputEXT EGLDisplay dpy @@ -1351,6 +1580,12 @@ EGLDisplay dpy EGLStreamKHR stream + + EGLBoolean eglStreamConsumerReleaseAttribKHR + EGLDisplay dpy + EGLStreamKHR stream + const EGLAttrib *attrib_list + EGLBoolean eglSurfaceAttrib EGLDisplay dpy @@ -1427,6 +1662,44 @@ EGLSyncKHR sync EGLint flags + + EGLBoolean eglCompositorSetContextListEXT + const EGLint *external_ref_ids + EGLint num_entries + + + EGLBoolean eglCompositorSetContextAttributesEXT + EGLint external_ref_id + const EGLint *context_attributes + EGLint num_entries + + + EGLBoolean eglCompositorSetWindowListEXT + EGLint external_ref_id + const EGLint *external_win_ids + EGLint num_entries + + + EGLBoolean eglCompositorSetWindowAttributesEXT + EGLint external_win_id + const EGLint *window_attributes + EGLint num_entries + + + EGLBoolean eglCompositorBindTexWindowEXT + EGLint external_win_id + + + EGLBoolean eglCompositorSetSizeEXT + EGLint external_win_id + EGLint width + EGLint height + + + EGLBoolean eglCompositorSwapPolicyEXT + EGLint external_win_id + EGLint policy + @@ -1699,11 +1972,25 @@ + + + + + + + + + + + + + + @@ -1718,6 +2005,11 @@ + + + + + @@ -1749,6 +2041,11 @@ + + + + + @@ -1804,6 +2101,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1830,6 +2157,23 @@ + + + + + + + + + + + + + + + + + @@ -1867,6 +2211,13 @@ + + + + + + + @@ -1890,6 +2241,11 @@ + + + + + @@ -1900,6 +2256,21 @@ + + + + + + + + + + + + + + + @@ -1956,6 +2327,12 @@ + + + + + + @@ -1979,6 +2356,13 @@ + + + + + + + @@ -2024,6 +2408,12 @@ + + + + + + @@ -2153,6 +2543,16 @@ + + + + + + + + + + @@ -2221,6 +2621,19 @@ + + + + + + + + + + + + + @@ -2293,6 +2706,11 @@ + + + + + @@ -2362,6 +2780,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2408,5 +2942,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.30.2