diff --git a/registry/egl.xml b/registry/egl.xml index 3823f899..5ab8d66f 100644 --- a/registry/egl.xml +++ b/registry/egl.xml @@ -1,7 +1,7 @@ @@ -38,6 +38,7 @@ #include <KHR/khrplatform.h> #include <EGL/eglplatform.h> + @@ -47,6 +48,10 @@ + struct AHardwareBuffer; + struct wl_buffer; + struct wl_display; + struct wl_resource; @@ -87,7 +92,13 @@ EGLint iHeight; EGLint iStride; }; + typedef void ( *EGLDEBUGPROCKHR)(EGLenum error,const char *command,EGLint messageType,EGLLabelKHR threadLabel,EGLLabelKHR objectLabel,const char* message); + #define PFNEGLBINDWAYLANDDISPLAYWL PFNEGLBINDWAYLANDDISPLAYWLPROC + #define PFNEGLUNBINDWAYLANDDISPLAYWL PFNEGLUNBINDWAYLANDDISPLAYWLPROC + #define PFNEGLQUERYWAYLANDBUFFERWL PFNEGLQUERYWAYLANDBUFFERWLPROC + #define PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWL PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWLPROC @@ -147,6 +158,7 @@ + + + + + + + + + + + @@ -613,7 +669,9 @@ - + + + @@ -686,7 +744,9 @@ - + + + @@ -701,8 +761,23 @@ - - + + + + + + + + + + + + + + + + + @@ -710,8 +785,10 @@ - - + + + + @@ -768,7 +845,8 @@ - + + @@ -781,13 +859,42 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -817,12 +924,73 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + @@ -844,6 +1012,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -885,6 +1082,12 @@ EGLint config_size EGLint *num_config + + EGLBoolean eglClientSignalSyncEXT + EGLDisplay dpy + EGLSync sync + const EGLAttrib *attrib_list + EGLint eglClientWaitSync EGLDisplay dpy @@ -1167,9 +1370,21 @@ EGLDisplay eglGetDisplay EGLNativeDisplayType display_id + + char *eglGetDisplayDriverConfig + EGLDisplay dpy + + + const char *eglGetDisplayDriverName + EGLDisplay dpy + EGLint eglGetError + + EGLClientBuffer eglGetNativeClientBufferANDROID + const struct AHardwareBuffer *buffer + EGLBoolean eglGetOutputLayersEXT EGLDisplay dpy @@ -1288,6 +1503,41 @@ EGLSurface surface EGLnsecsANDROID time + + EGLBoolean eglGetCompositorTimingSupportedANDROID + EGLDisplay dpy + EGLSurface surface + EGLint name + + + EGLBoolean eglGetCompositorTimingANDROID + EGLDisplay dpy + EGLSurface surface + EGLint numTimestamps + const EGLint *names + EGLnsecsANDROID *values + + + EGLBoolean eglGetNextFrameIdANDROID + EGLDisplay dpy + EGLSurface surface + EGLuint64KHR *frameId + + + EGLBoolean eglGetFrameTimestampSupportedANDROID + EGLDisplay dpy + EGLSurface surface + EGLint timestamp + + + EGLBoolean eglGetFrameTimestampsANDROID + EGLDisplay dpy + EGLSurface surface + EGLuint64KHR frameId + EGLint numTimestamps + const EGLint *timestamps + EGLnsecsANDROID *values + EGLenum eglQueryAPI @@ -1325,29 +1575,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 + EGLint *formats + EGLint *num_formats EGLBoolean eglQueryDmaBufModifiersEXT EGLDisplay dpy EGLint format EGLint max_modifiers - EGLuint64KHR *modifiers - EGLBoolean *external_only - EGLint *num_modifiers + EGLuint64KHR *modifiers + EGLBoolean *external_only + EGLint *num_modifiers EGLBoolean eglQueryNativeDisplayNV @@ -1537,7 +1794,7 @@ EGLBoolean eglStreamConsumerGLTextureExternalAttribsNV EGLDisplay dpy EGLStreamKHR stream - EGLAttrib *attrib_list + const EGLAttrib *attrib_list EGLBoolean eglStreamConsumerOutputEXT @@ -1556,6 +1813,11 @@ EGLStreamKHR stream const EGLAttrib *attrib_list + + EGLBoolean eglStreamFlushNV + EGLDisplay dpy + EGLStreamKHR stream + EGLBoolean eglSurfaceAttrib EGLDisplay dpy @@ -1572,14 +1834,14 @@ EGLBoolean eglSwapBuffersWithDamageEXT EGLDisplay dpy EGLSurface surface - EGLint *rects + const EGLint *rects EGLint n_rects EGLBoolean eglSwapBuffersWithDamageKHR EGLDisplay dpy EGLSurface surface - EGLint *rects + const EGLint *rects EGLint n_rects @@ -1610,6 +1872,12 @@ EGLDisplay dpy EGLSurface surface + + EGLBoolean eglUnsignalSyncEXT + EGLDisplay dpy + EGLSync sync + const EGLAttrib *attrib_list + EGLBoolean eglWaitClient @@ -1632,6 +1900,96 @@ 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 + + + EGLBoolean eglBindWaylandDisplayWL + EGLDisplay dpy + struct wl_display *display + + + EGLBoolean eglUnbindWaylandDisplayWL + EGLDisplay dpy + struct wl_display *display + + + EGLBoolean eglQueryWaylandBufferWL + EGLDisplay dpy + struct wl_resource *buffer + EGLint attribute + EGLint *value + + + struct wl_buffer *eglCreateWaylandBufferFromImageWL + EGLDisplay dpy + EGLImageKHR image + + + EGLBoolean eglStreamImageConsumerConnectNV + EGLDisplay dpy + EGLStreamKHR stream + EGLint num_modifiers + EGLuint64KHR *modifiers + EGLAttrib *attrib_list + + + EGLint eglQueryStreamConsumerEventNV + EGLDisplay dpy + EGLStreamKHR stream + EGLTime timeout + EGLenum *event + EGLAttrib *aux + + + EGLBoolean eglStreamAcquireImageNV + EGLDisplay dpy + EGLStreamKHR stream + EGLImage *pImage + EGLSync sync + + + EGLBoolean eglStreamReleaseImageNV + EGLDisplay dpy + EGLStreamKHR stream + EGLImage image + EGLSync sync + @@ -1918,6 +2276,11 @@ + + + + + @@ -1942,11 +2305,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1989,6 +2377,13 @@ + + + + + + + @@ -2011,6 +2406,7 @@ + @@ -2043,11 +2439,31 @@ + + + + + + + + + + + + + + + + + + + + @@ -2091,6 +2507,12 @@ + + + + + + @@ -2185,6 +2607,7 @@ + @@ -2192,6 +2615,11 @@ + + + + + @@ -2324,6 +2752,12 @@ + + + + + + @@ -2600,6 +3034,7 @@ + @@ -2621,6 +3056,12 @@ + + + + + + @@ -2647,6 +3088,11 @@ + + + + + @@ -2690,6 +3136,11 @@ + + + + + @@ -2730,6 +3181,24 @@ + + + + + + + + + + + + + + + + + + @@ -2741,6 +3210,11 @@ + + + + + @@ -2842,6 +3316,11 @@ + + + + + @@ -2852,5 +3331,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/registry/gl.xml b/registry/gl.xml index cf4bbc2d..00846ff5 100644 --- a/registry/gl.xml +++ b/registry/gl.xml @@ -1,97 +1,51 @@ -Copyright (c) 2013-2016 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Materials. - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +Copyright (c) 2013-2018 The Khronos Group Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. ------------------------------------------------------------------------ -This file, gl.xml, is the OpenGL and OpenGL API Registry. The older -".spec" file format has been retired and will no longer be updated with -new extensions and API versions. The canonical version of the registry, -together with documentation, schema, and Python generator scripts used -to generate C header files for OpenGL and OpenGL ES, can always be found -in the Khronos Registry at - http://www.opengl.org/registry/ +This file, gl.xml, is the OpenGL and OpenGL API Registry. The canonical +version of the registry, together with documentation, schema, and Python +generator scripts used to generate C header files for OpenGL and OpenGL ES, +can always be found in the Khronos Registry at + https://github.com/KhronosGroup/OpenGL-Registry - #include <stddef.h> #include <KHR/khrplatform.h> - #ifndef GLEXT_64_TYPES_DEFINED -/* This code block is duplicated in glxext.h, so must be protected */ -#define GLEXT_64_TYPES_DEFINED -/* Define int32_t, int64_t, and uint64_t types for UST/MSC */ -/* (as used in the GL_EXT_timer_query extension). */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#include <inttypes.h> -#elif defined(__sun__) || defined(__digital__) -#include <inttypes.h> -#if defined(__STDC__) -#if defined(__arch64__) || defined(_LP64) -typedef long int int64_t; -typedef unsigned long int uint64_t; -#else -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#endif /* __arch64__ */ -#endif /* __STDC__ */ -#elif defined( __VMS ) || defined(__sgi) -#include <inttypes.h> -#elif defined(__SCO__) || defined(__USLC__) -#include <stdint.h> -#elif defined(__UNIXOS2__) || defined(__SOL64__) -typedef long int int32_t; -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#elif defined(_WIN32) && defined(__GNUC__) -#include <stdint.h> -#elif defined(_WIN32) -typedef __int32 int32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -#else -/* Fallback if nothing above works */ -#include <inttypes.h> -#endif -#endif typedef unsigned int GLenum; typedef unsigned char GLboolean; typedef unsigned int GLbitfield; typedef void GLvoid; - typedef signed char GLbyte; - typedef short GLshort; + typedef khronos_int8_t GLbyte; + typedef khronos_uint8_t GLubyte; + typedef khronos_int16_t GLshort; + typedef khronos_uint16_t GLushort; typedef int GLint; - typedef int GLclampx; - typedef unsigned char GLubyte; - typedef unsigned short GLushort; typedef unsigned int GLuint; + typedef khronos_int32_t GLclampx; typedef int GLsizei; - typedef float GLfloat; - typedef float GLclampf; + typedef khronos_float_t GLfloat; + typedef khronos_float_t GLclampf; typedef double GLdouble; typedef double GLclampd; + typedef void *GLeglClientBufferEXT; typedef void *GLeglImageOES; typedef char GLchar; typedef char GLcharARB; @@ -100,62 +54,664 @@ typedef void *GLhandleARB; #else typedef unsigned int GLhandleARB; #endif - typedef unsigned short GLhalfARB; - typedef unsigned short GLhalf; - typedef GLint GLfixed; - typedef ptrdiff_t GLintptr; - typedef ptrdiff_t GLsizeiptr; - typedef int64_t GLint64; - typedef uint64_t GLuint64; - typedef ptrdiff_t GLintptrARB; - typedef ptrdiff_t GLsizeiptrARB; - typedef int64_t GLint64EXT; - typedef uint64_t GLuint64EXT; + typedef khronos_uint16_t GLhalf; + typedef khronos_uint16_t GLhalfARB; + typedef khronos_int32_t GLfixed; + typedef khronos_intptr_t GLintptr; + typedef khronos_intptr_t GLintptrARB; + typedef khronos_ssize_t GLsizeiptr; + typedef khronos_ssize_t GLsizeiptrARB; + typedef khronos_int64_t GLint64; + typedef khronos_int64_t GLint64EXT; + typedef khronos_uint64_t GLuint64; + typedef khronos_uint64_t GLuint64EXT; typedef struct __GLsync *GLsync; struct _cl_context; struct _cl_event; typedef void ( *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); typedef void ( *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); typedef void ( *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); - - typedef khronos_int32_t GLclampx; - - typedef khronos_int8_t GLbyte; - typedef khronos_uint8_t GLubyte; - typedef khronos_float_t GLfloat; - typedef khronos_float_t GLclampf; - typedef khronos_int32_t GLfixed; - typedef khronos_int64_t GLint64; - typedef khronos_uint64_t GLuint64; - typedef khronos_intptr_t GLintptr; - typedef khronos_ssize_t GLsizeiptr; - - typedef khronos_int8_t GLbyte; - typedef khronos_uint8_t GLubyte; - typedef khronos_float_t GLfloat; - typedef khronos_float_t GLclampf; - typedef khronos_int32_t GLfixed; - typedef khronos_int64_t GLint64; - typedef khronos_uint64_t GLuint64; - typedef khronos_int64_t GLint64EXT; - typedef khronos_uint64_t GLuint64EXT; - typedef khronos_intptr_t GLintptr; - typedef khronos_ssize_t GLsizeiptr; - - - typedef khronos_uint8_t GLubyte; - typedef khronos_float_t GLfloat; - typedef khronos_intptr_t GLintptr; - typedef khronos_ssize_t GLsizeiptr; + typedef void ( *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam); typedef unsigned short GLhalfNV; typedef GLintptr GLvdpauSurfaceNV; + typedef void ( *GLVULKANPROCNV)(void); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -206,48 +762,110 @@ typedef unsigned int GLhandleARB; + + + - + + - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -334,8 +952,11 @@ typedef unsigned int GLhandleARB; + + + @@ -399,6 +1020,44 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -410,6 +1069,14 @@ typedef unsigned int GLhandleARB; + + + + + + + + @@ -423,6 +1090,9 @@ typedef unsigned int GLhandleARB; + + + @@ -438,6 +1108,7 @@ typedef unsigned int GLhandleARB; + @@ -474,6 +1145,7 @@ typedef unsigned int GLhandleARB; + @@ -487,11 +1159,20 @@ typedef unsigned int GLhandleARB; + + + + + + + + + @@ -503,6 +1184,7 @@ typedef unsigned int GLhandleARB; + @@ -526,6 +1208,17 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + @@ -591,6 +1284,10 @@ typedef unsigned int GLhandleARB; + + + + @@ -607,6 +1304,16 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + @@ -618,6 +1325,15 @@ typedef unsigned int GLhandleARB; + + + + + + + + + @@ -629,6 +1345,22 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + @@ -642,6 +1374,8 @@ typedef unsigned int GLhandleARB; + + @@ -663,6 +1397,7 @@ typedef unsigned int GLhandleARB; + @@ -674,6 +1409,7 @@ typedef unsigned int GLhandleARB; + @@ -683,10 +1419,17 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -712,6 +1455,8 @@ typedef unsigned int GLhandleARB; + + @@ -720,6 +1465,7 @@ typedef unsigned int GLhandleARB; + @@ -727,6 +1473,7 @@ typedef unsigned int GLhandleARB; + @@ -737,15 +1484,22 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -768,6 +1522,7 @@ typedef unsigned int GLhandleARB; + @@ -776,6 +1531,8 @@ typedef unsigned int GLhandleARB; + + @@ -790,6 +1547,7 @@ typedef unsigned int GLhandleARB; + @@ -817,6 +1575,7 @@ typedef unsigned int GLhandleARB; + @@ -842,9 +1601,11 @@ typedef unsigned int GLhandleARB; + + @@ -856,20 +1617,98 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -881,13 +1720,20 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -905,6 +1751,7 @@ typedef unsigned int GLhandleARB; + @@ -916,6 +1763,8 @@ typedef unsigned int GLhandleARB; + + @@ -954,23 +1803,35 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + @@ -979,6 +1840,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -989,6 +1855,13 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -1008,11 +1881,20 @@ typedef unsigned int GLhandleARB; + + + + - - - + + + + + + + + @@ -1022,13 +1904,23 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + @@ -1036,13 +1928,20 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -1063,6 +1962,8 @@ typedef unsigned int GLhandleARB; + + @@ -1311,10 +2212,9 @@ typedef unsigned int GLhandleARB; - - - + + @@ -1322,6 +2222,7 @@ typedef unsigned int GLhandleARB; + @@ -1390,6 +2291,7 @@ typedef unsigned int GLhandleARB; + @@ -1415,6 +2317,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -1451,18 +2358,30 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + @@ -1471,15 +2390,13 @@ typedef unsigned int GLhandleARB; + - + - - - - + @@ -1497,49 +2414,303 @@ typedef unsigned int GLhandleARB; - + - + - - + + - - + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1770,6 +2941,22 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + @@ -1795,6 +2982,10 @@ typedef unsigned int GLhandleARB; + + + + @@ -1805,6 +2996,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -1818,7 +3015,9 @@ typedef unsigned int GLhandleARB; + + @@ -1830,6 +3029,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -1954,31 +3159,96 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + @@ -1990,6 +3260,8 @@ typedef unsigned int GLhandleARB; + + @@ -1999,156 +3271,1439 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + - - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2162,10 +4717,24 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + @@ -2294,11 +4863,18 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -2418,6 +4994,8 @@ typedef unsigned int GLhandleARB; + + @@ -3524,8 +6102,10 @@ typedef unsigned int GLhandleARB; - - + + + + @@ -4161,18 +6741,30 @@ typedef unsigned int GLhandleARB; ARB_direct_state_access in February 2015 after determining it was not well defined or implementable. --> - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -4182,7 +6774,8 @@ typedef unsigned int GLhandleARB; - + + @@ -4378,7 +6971,8 @@ typedef unsigned int GLhandleARB; - + + @@ -4660,8 +7254,10 @@ typedef unsigned int GLhandleARB; - - + + + + @@ -5089,6 +7685,7 @@ typedef unsigned int GLhandleARB; + @@ -5363,7 +7960,7 @@ typedef unsigned int GLhandleARB; - + @@ -5966,16 +8563,20 @@ typedef unsigned int GLhandleARB; + + + + @@ -6422,6 +9023,10 @@ typedef unsigned int GLhandleARB; + + + + @@ -6448,7 +9053,11 @@ typedef unsigned int GLhandleARB; - + + + + + @@ -6658,11 +9267,12 @@ typedef unsigned int GLhandleARB; - + + @@ -7143,7 +9753,8 @@ typedef unsigned int GLhandleARB; - + + @@ -7236,7 +9847,22 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + + + + @@ -7315,12 +9941,16 @@ typedef unsigned int GLhandleARB; + + + + @@ -7443,7 +10073,9 @@ typedef unsigned int GLhandleARB; - + + + @@ -7479,7 +10111,8 @@ typedef unsigned int GLhandleARB; - + + @@ -7489,7 +10122,7 @@ typedef unsigned int GLhandleARB; - + @@ -8034,9 +10667,17 @@ typedef unsigned int GLhandleARB; - - - + + + + + + + + + + + @@ -8187,14 +10828,16 @@ typedef unsigned int GLhandleARB; - + + + - + @@ -8238,7 +10881,7 @@ typedef unsigned int GLhandleARB; - + @@ -8352,7 +10995,9 @@ typedef unsigned int GLhandleARB; - + + + @@ -8366,13 +11011,19 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -8393,7 +11044,7 @@ typedef unsigned int GLhandleARB; - + @@ -8402,7 +11053,36 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8530,11 +11210,127 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8542,7 +11338,7 @@ typedef unsigned int GLhandleARB; - + @@ -8563,7 +11359,10 @@ typedef unsigned int GLhandleARB; - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + GLsizei count + const GLint *box + + + void glWriteMaskEXT + GLuint res + GLuint in + GLenum outX + GLenum outY + GLenum outZ + GLenum outW + + + void glDrawVkImageNV + GLuint64 vkImage + GLuint sampler + GLfloat x0 + GLfloat y0 + GLfloat x1 + GLfloat y1 + GLfloat z + GLfloat s0 + GLfloat t0 + GLfloat s1 + GLfloat t1 + + + GLVULKANPROCNV glGetVkProcAddrNV + const GLchar *name + + + void glWaitVkSemaphoreNV + GLuint64 vkSemaphore + + + void glSignalVkSemaphoreNV + GLuint64 vkSemaphore + + + void glSignalVkFenceNV + GLuint64 vkFence + + + void glFramebufferParameteriMESA + GLenum target + GLenum pname + GLint param + + + void glGetFramebufferParameterivMESA + GLenum target + GLenum pname + GLint *params + + + + + + - - - + @@ -30525,7 +33825,6 @@ typedef unsigned int GLhandleARB; - @@ -30553,21 +33852,9 @@ typedef unsigned int GLhandleARB; - - - - - - - - - - - - @@ -30578,7 +33865,6 @@ typedef unsigned int GLhandleARB; - @@ -30630,23 +33916,7 @@ typedef unsigned int GLhandleARB; - - - - - - - - - - - - - - - - @@ -30665,9 +33935,6 @@ typedef unsigned int GLhandleARB; - - - @@ -30707,14 +33974,6 @@ typedef unsigned int GLhandleARB; - - - - - - - - @@ -30760,11 +34019,9 @@ typedef unsigned int GLhandleARB; - - @@ -30814,7 +34071,6 @@ typedef unsigned int GLhandleARB; - @@ -30850,6 +34106,424 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30873,58 +34547,10 @@ typedef unsigned int GLhandleARB; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -30958,20 +34584,6 @@ typedef unsigned int GLhandleARB; - - - - - - - - - - - - - - @@ -31051,7 +34663,7 @@ typedef unsigned int GLhandleARB; - + @@ -31287,15 +34899,17 @@ typedef unsigned int GLhandleARB; - - - - - + + + + + + + @@ -31847,6 +35461,7 @@ typedef unsigned int GLhandleARB; + @@ -31868,8 +35483,7 @@ typedef unsigned int GLhandleARB; - - + @@ -32917,6 +36531,7 @@ typedef unsigned int GLhandleARB; + @@ -33248,6 +36863,7 @@ typedef unsigned int GLhandleARB; + @@ -33909,7 +37525,6 @@ typedef unsigned int GLhandleARB; - + + + + + + @@ -36629,7 +40304,19 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + @@ -36659,6 +40346,7 @@ typedef unsigned int GLhandleARB; + @@ -36822,6 +40510,8 @@ typedef unsigned int GLhandleARB; + + @@ -36849,6 +40539,7 @@ typedef unsigned int GLhandleARB; + @@ -37242,7 +40933,7 @@ typedef unsigned int GLhandleARB; - + @@ -37668,7 +41359,7 @@ typedef unsigned int GLhandleARB; - + @@ -37801,7 +41492,7 @@ typedef unsigned int GLhandleARB; - + @@ -37921,7 +41612,7 @@ typedef unsigned int GLhandleARB; - + @@ -37966,6 +41657,13 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -38011,7 +41709,7 @@ typedef unsigned int GLhandleARB; - + @@ -38073,17 +41771,17 @@ typedef unsigned int GLhandleARB; + + - + + - - - @@ -38194,7 +41892,7 @@ typedef unsigned int GLhandleARB; - + @@ -38323,6 +42021,29 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + @@ -38497,7 +42218,7 @@ typedef unsigned int GLhandleARB; - + @@ -38519,7 +42240,7 @@ typedef unsigned int GLhandleARB; - + @@ -38543,7 +42264,13 @@ typedef unsigned int GLhandleARB; - + + + + + + + @@ -38657,7 +42384,7 @@ typedef unsigned int GLhandleARB; - + @@ -38727,6 +42454,7 @@ typedef unsigned int GLhandleARB; + @@ -38781,7 +42509,7 @@ typedef unsigned int GLhandleARB; - + @@ -38816,9 +42544,9 @@ typedef unsigned int GLhandleARB; - + - + @@ -39018,7 +42746,7 @@ typedef unsigned int GLhandleARB; - + @@ -39060,7 +42788,7 @@ typedef unsigned int GLhandleARB; - + @@ -39080,8 +42808,14 @@ typedef unsigned int GLhandleARB; - - + + + + + + + + @@ -39161,12 +42895,12 @@ typedef unsigned int GLhandleARB; - + - + @@ -39290,7 +43024,13 @@ typedef unsigned int GLhandleARB; - + + + + + + + @@ -39332,7 +43072,7 @@ typedef unsigned int GLhandleARB; - + @@ -39366,7 +43106,7 @@ typedef unsigned int GLhandleARB; - + @@ -40407,6 +44147,17 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + @@ -40526,6 +44277,17 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + @@ -40696,7 +44458,7 @@ typedef unsigned int GLhandleARB; - + @@ -40710,7 +44472,12 @@ typedef unsigned int GLhandleARB; - + + + + + + @@ -41210,6 +44977,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -41537,6 +45310,67 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41601,6 +45435,9 @@ typedef unsigned int GLhandleARB; + + + @@ -41791,6 +45628,51 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41902,9 +45784,15 @@ typedef unsigned int GLhandleARB; - + + + + + + + @@ -42028,7 +45916,7 @@ typedef unsigned int GLhandleARB; - + @@ -42228,6 +46116,19 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + @@ -42242,7 +46143,7 @@ typedef unsigned int GLhandleARB; - + @@ -42258,6 +46159,14 @@ typedef unsigned int GLhandleARB; + + + + + + + + @@ -42327,13 +46236,8 @@ typedef unsigned int GLhandleARB; - - - - - - - + + @@ -42341,6 +46245,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -42412,6 +46321,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -42446,6 +46360,7 @@ typedef unsigned int GLhandleARB; + @@ -42474,7 +46389,7 @@ typedef unsigned int GLhandleARB; - + @@ -42879,6 +46794,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -43148,6 +47069,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -43232,7 +47158,7 @@ typedef unsigned int GLhandleARB; - + @@ -43383,6 +47309,22 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + @@ -43448,6 +47390,13 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -43458,16 +47407,36 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + @@ -43503,6 +47472,12 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -43518,13 +47493,31 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + + + + + + + - + @@ -43609,8 +47602,14 @@ typedef unsigned int GLhandleARB; + + + + + + - + @@ -43618,7 +47617,7 @@ typedef unsigned int GLhandleARB; - + @@ -43664,6 +47663,7 @@ typedef unsigned int GLhandleARB; + @@ -43683,7 +47683,7 @@ typedef unsigned int GLhandleARB; - + @@ -43691,6 +47691,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -43700,6 +47705,7 @@ typedef unsigned int GLhandleARB; + @@ -43809,6 +47815,15 @@ typedef unsigned int GLhandleARB; + + + + + + + + + @@ -43967,6 +47982,7 @@ typedef unsigned int GLhandleARB; + @@ -44007,7 +48023,7 @@ typedef unsigned int GLhandleARB; - + @@ -44230,6 +48246,126 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44529,6 +48665,25 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + @@ -44548,6 +48703,14 @@ typedef unsigned int GLhandleARB; + + + + + + + + @@ -44592,6 +48755,24 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + @@ -44682,6 +48863,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -44717,12 +48903,20 @@ typedef unsigned int GLhandleARB; - - - + + + + + + + + + + + - - + + @@ -44743,7 +48937,7 @@ typedef unsigned int GLhandleARB; - + @@ -44752,14 +48946,53 @@ typedef unsigned int GLhandleARB; - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44770,7 +49003,7 @@ typedef unsigned int GLhandleARB; - + @@ -44793,7 +49026,7 @@ typedef unsigned int GLhandleARB; - + @@ -44843,6 +49076,7 @@ typedef unsigned int GLhandleARB; + @@ -45010,7 +49244,7 @@ typedef unsigned int GLhandleARB; - + @@ -45035,6 +49269,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -45051,7 +49290,7 @@ typedef unsigned int GLhandleARB; - + @@ -45076,7 +49315,7 @@ typedef unsigned int GLhandleARB; - + @@ -45557,7 +49796,7 @@ typedef unsigned int GLhandleARB; - + @@ -45961,7 +50200,7 @@ typedef unsigned int GLhandleARB; - + @@ -46178,7 +50417,7 @@ typedef unsigned int GLhandleARB; - + @@ -46392,11 +50631,45 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -46440,6 +50713,8 @@ typedef unsigned int GLhandleARB; + + @@ -47114,5 +51389,6 @@ typedef unsigned int GLhandleARB; + diff --git a/registry/glx.xml b/registry/glx.xml index fe32a8cb..0ce9cba6 100644 --- a/registry/glx.xml +++ b/registry/glx.xml @@ -1,36 +1,28 @@ - - + +Copyright (c) 2013-2018 The Khronos Group Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +------------------------------------------------------------------------ + +This file, glx.xml, is the GLX API Registry. The canonical version of the +registry, together with documentation, schema, and Python generator scripts +used to generate C header files for GLX, can always be found in the Khronos +Registry at + https://github.com/KhronosGroup/OpenGL-Registry + @@ -470,6 +462,17 @@ typedef unsigned __int64 uint64_t; + + + + + + + + + + + @@ -587,8 +590,7 @@ typedef unsigned __int64 uint64_t; - - + - +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +------------------------------------------------------------------------ + +This file, wgl.xml, is the WGL API Registry. The older ".spec" file +format has been retired and will no longer be updated with new +extensions and API versions. The canonical version of the registry, +together with documentation, schema, and Python generator scripts used +to generate C header files for WGL, can always be found in the Khronos +Registry at + https://github.com/KhronosGroup/OpenGL-Registry + @@ -390,7 +384,12 @@ - + + + + + + @@ -433,6 +432,7 @@ + @@ -457,11 +457,15 @@ - + + + + + @@ -539,7 +543,7 @@ BOOL wglBindVideoDeviceNV - HDC hDC + HDC hDc unsigned int uVideoSlot HVIDEOOUTPUTDEVICENV hVideoDevice const int *piAttribList @@ -782,7 +786,7 @@ int wglEnumerateVideoDevicesNV - HDC hDC + HDC hDc HVIDEOOUTPUTDEVICENV *phDeviceList @@ -913,7 +917,7 @@ INT wglGetGPUInfoAMD UINT id - int property + INT property GLenum dataType UINT size void *data @@ -1236,7 +1240,7 @@ INT64 wglSwapLayerBuffersMscOML HDC hdc - int fuPlanes + INT fuPlanes INT64 target_msc INT64 divisor INT64 remainder @@ -1451,6 +1455,11 @@ + + + + + @@ -1624,6 +1633,11 @@ + + + + + @@ -1976,5 +1990,14 @@ + + + + + + + + +