From df8602f4b534096ec09d83f6ee543187ff0fb411 Mon Sep 17 00:00:00 2001 From: Heinrich Fink Date: Mon, 16 Sep 2019 13:20:49 +0200 Subject: [PATCH] mesa/gl: Sync with Khronos registry Update GL headers and xml API from upstream Khronos registry (commit 3d0c3eb). Keep `BUILDING_MESA` quirk in glext.h. mesa/extensions: Expose EXT_EGL_sync instead of MESA_EGL_sync to reflect Khronos request of changing this extension's scope from MESA to EXT. EGL_EGL_sync is also the name of the extension that has been merged into the upstream Khronos GL registry. Remove MESA_EGL_sync spec txt from Mesa tree as it is now published as EXT by Khronos. v1: Remove MESA_EGL_sync spec and squash commits (Eric E) Reviewed-by: Eric Engestrom Reviewed-by: Daniel Stone --- docs/specs/MESA_EGL_sync.txt | 79 -- include/GL/glcorearb.h | 14 +- include/GL/glext.h | 16 +- include/GL/glxext.h | 11 +- src/mapi/glapi/registry/gl.xml | 1526 +++++++++++++++++++++++++++--- src/mesa/main/extensions_table.h | 2 +- 6 files changed, 1406 insertions(+), 242 deletions(-) delete mode 100644 docs/specs/MESA_EGL_sync.txt diff --git a/docs/specs/MESA_EGL_sync.txt b/docs/specs/MESA_EGL_sync.txt deleted file mode 100644 index a539ea3e70c..00000000000 --- a/docs/specs/MESA_EGL_sync.txt +++ /dev/null @@ -1,79 +0,0 @@ -Name - - MESA_EGL_sync - -Name Strings - - GL_MESA_EGL_sync - -Contact - - Heinrich Fink, DAQRI (heinrich.fink 'at' daqri.com) - -Contributors - - Heinrich Fink, DAQRI - Daniel Stone, Collabora - Marek Olšák, AMD - -Status - - Proposal - -Version - - Version 2, July 29, 2019 - -Number - - OpenGL Extension #545 - -Dependencies - - EGL_KHR_fence_sync is required. - - This extension is written against the EGL 1.2 Specification, as modified by - the EGL_KHR_fence_sync extension. - -Overview - - This extension extends EGL_KHR_fence_sync with client API support for - OpenGL (compatibility or core profiles) as a Mesa extension. - - The "GL_MESA_EGL_sync" string indicates that a fence sync object can be - created in association with a fence command placed in the command stream - of a bound OpenGL context. - -IP Status - - None - -New Procedures and Functions - - None - -New Tokens - - None - -Additions to Chapter 3 of the EGL 1.2 Specification (EGL Functions and Errors) - - Modify Section 3.8.1 Sync Objects, page 43 - - After "Each client API which supports..." add a new paragraph: - - If the GL_MESA_EGL_sync extension is supported by OpenGL (compatibility or - core profile), a fence sync object may be created when the currently bound API - is OpenGL. - -Errors - - None - -Revision History - - Version 2, July 29th, 2019 - Update extension no in draft - - Version 1, June 5th, 2019 - Initial draft (Heinrich Fink) diff --git a/include/GL/glcorearb.h b/include/GL/glcorearb.h index 3ed00a433f8..e8515a17644 100644 --- a/include/GL/glcorearb.h +++ b/include/GL/glcorearb.h @@ -4026,6 +4026,10 @@ GLAPI void APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImag #endif #endif /* GL_EXT_EGL_image_storage */ +#ifndef GL_EXT_EGL_sync +#define GL_EXT_EGL_sync 1 +#endif /* GL_EXT_EGL_sync */ + #ifndef GL_EXT_debug_label #define GL_EXT_debug_label 1 #define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F @@ -4763,12 +4767,14 @@ GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLen #ifndef GL_MESA_framebuffer_flip_y #define GL_MESA_framebuffer_flip_y 1 #define GL_FRAMEBUFFER_FLIP_Y_MESA 0x8BBB +typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIMESAPROC) (GLenum target, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVMESAPROC) (GLenum target, GLenum pname, GLint *params); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFramebufferParameteriMESA (GLenum target, GLenum pname, GLint param); +GLAPI void APIENTRY glGetFramebufferParameterivMESA (GLenum target, GLenum pname, GLint *params); +#endif #endif /* GL_MESA_framebuffer_flip_y */ -#ifndef GL_MESA_EGL_sync -#define GL_MESA_EGL_sync 1 -#endif /* GL_MESA_EGL_sync */ - #ifndef GL_NV_bindless_multi_draw_indirect #define GL_NV_bindless_multi_draw_indirect 1 typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount); diff --git a/include/GL/glext.h b/include/GL/glext.h index 8d4f59c18c4..e8694ae0966 100644 --- a/include/GL/glext.h +++ b/include/GL/glext.h @@ -51,7 +51,7 @@ extern "C" { #define GLAPI extern #endif -#define GL_GLEXT_VERSION 20190728 +#define GL_GLEXT_VERSION 20190911 #include @@ -6486,6 +6486,10 @@ GLAPI void APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImag #endif #endif /* GL_EXT_EGL_image_storage */ +#ifndef GL_EXT_EGL_sync +#define GL_EXT_EGL_sync 1 +#endif /* GL_EXT_EGL_sync */ + #ifndef GL_EXT_abgr #define GL_EXT_abgr 1 #define GL_ABGR_EXT 0x8000 @@ -9283,12 +9287,14 @@ GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLen #ifndef GL_MESA_framebuffer_flip_y #define GL_MESA_framebuffer_flip_y 1 #define GL_FRAMEBUFFER_FLIP_Y_MESA 0x8BBB +typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIMESAPROC) (GLenum target, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVMESAPROC) (GLenum target, GLenum pname, GLint *params); +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFramebufferParameteriMESA (GLenum target, GLenum pname, GLint param); +GLAPI void APIENTRY glGetFramebufferParameterivMESA (GLenum target, GLenum pname, GLint *params); +#endif #endif /* GL_MESA_framebuffer_flip_y */ -#ifndef GL_MESA_EGL_sync -#define GL_MESA_EGL_sync 1 -#endif /* GL_MESA_EGL_sync */ - #ifndef GL_MESA_pack_invert #define GL_MESA_pack_invert 1 #define GL_PACK_INVERT_MESA 0x8758 diff --git a/include/GL/glxext.h b/include/GL/glxext.h index a6f1c0c4331..662c26546bd 100644 --- a/include/GL/glxext.h +++ b/include/GL/glxext.h @@ -34,7 +34,7 @@ extern "C" { ** https://github.com/KhronosGroup/OpenGL-Registry */ -#define GLX_GLXEXT_VERSION 20190728 +#define GLX_GLXEXT_VERSION 20190911 /* Generated C header for: * API: glx @@ -555,6 +555,15 @@ Bool glXDelayBeforeSwapNV (Display *dpy, GLXDrawable drawable, GLfloat seconds); #define GLX_FLOAT_COMPONENTS_NV 0x20B0 #endif /* GLX_NV_float_buffer */ +#ifndef GLX_NV_multigpu_context +#define GLX_NV_multigpu_context 1 +#define GLX_CONTEXT_MULTIGPU_ATTRIB_NV 0x20AA +#define GLX_CONTEXT_MULTIGPU_ATTRIB_SINGLE_NV 0x20AB +#define GLX_CONTEXT_MULTIGPU_ATTRIB_AFR_NV 0x20AC +#define GLX_CONTEXT_MULTIGPU_ATTRIB_MULTICAST_NV 0x20AD +#define GLX_CONTEXT_MULTIGPU_ATTRIB_MULTI_DISPLAY_MULTICAST_NV 0x20AE +#endif /* GLX_NV_multigpu_context */ + #ifndef GLX_NV_multisample_coverage #define GLX_NV_multisample_coverage 1 #define GLX_COVERAGE_SAMPLES_NV 100001 diff --git a/src/mapi/glapi/registry/gl.xml b/src/mapi/glapi/registry/gl.xml index c734b613a96..3a2010f17cb 100644 --- a/src/mapi/glapi/registry/gl.xml +++ b/src/mapi/glapi/registry/gl.xml @@ -1,7 +1,7 @@ -Copyright (c) 2013-2018 The Khronos Group Inc. +Copyright (c) 2013-2019 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. @@ -79,9 +79,650 @@ typedef unsigned int GLhandleARB; typedef void ( *GLVULKANPROCNV)(void); - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -220,23 +861,22 @@ typedef unsigned int GLhandleARB; - + + + + + - - - - - - - - + + + @@ -391,6 +1031,38 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -408,7 +1080,14 @@ typedef unsigned int GLhandleARB; - + + + + + + + + @@ -1420,8 +2099,6 @@ typedef unsigned int GLhandleARB; - - @@ -1546,11 +2223,7 @@ typedef unsigned int GLhandleARB; - - - - - + @@ -1567,9 +2240,6 @@ typedef unsigned int GLhandleARB; - - - @@ -1847,6 +2517,7 @@ typedef unsigned int GLhandleARB; + @@ -1914,7 +2585,6 @@ typedef unsigned int GLhandleARB; - @@ -1926,6 +2596,20 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + @@ -1961,6 +2645,83 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2191,6 +2952,22 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + @@ -2494,6 +3271,8 @@ typedef unsigned int GLhandleARB; + + @@ -2517,6 +3296,18 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + @@ -2644,11 +3435,15 @@ typedef unsigned int GLhandleARB; - + + + + + @@ -2699,6 +3494,10 @@ typedef unsigned int GLhandleARB; + + + + @@ -2860,6 +3659,20 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + @@ -2954,17 +3767,21 @@ typedef unsigned int GLhandleARB; - + + + + + + - - + @@ -3003,7 +3820,6 @@ typedef unsigned int GLhandleARB; - @@ -3187,24 +4003,6 @@ typedef unsigned int GLhandleARB; - - - - - - - - - - - - - - - - - - @@ -3219,6 +4017,87 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3517,6 +4396,182 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3552,8 +4607,17 @@ typedef unsigned int GLhandleARB; - - + + + + + + + + + + + @@ -3583,7 +4647,7 @@ typedef unsigned int GLhandleARB; - + @@ -3600,15 +4664,6 @@ typedef unsigned int GLhandleARB; - - - - - - - - - @@ -3679,6 +4734,18 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + @@ -10156,7 +11223,10 @@ typedef unsigned int GLhandleARB; - + + + + @@ -10177,7 +11247,8 @@ typedef unsigned int GLhandleARB; - + + @@ -10540,6 +11611,48 @@ typedef unsigned int GLhandleARB; GLuint buffer GLuint offset + + GLuint glAsyncCopyBufferSubDataNVX + GLsizei waitSemaphoreCount + const GLuint *waitSemaphoreArray + const GLuint64 *fenceValueArray + GLuint readGpu + GLbitfield writeGpuMask + GLuint readBuffer + GLuint writeBuffer + GLintptr readOffset + GLintptr writeOffset + GLsizeiptr size + GLsizei signalSemaphoreCount + const GLuint *signalSemaphoreArray + const GLuint64 *signalValueArray + + + GLuint glAsyncCopyImageSubDataNVX + GLsizei waitSemaphoreCount + const GLuint *waitSemaphoreArray + const GLuint64 *waitValueArray + GLuint srcGpu + GLbitfield dstGpuMask + GLuint srcName + GLenum srcTarget + GLint srcLevel + GLint srcX + GLint srcY + GLint srcZ + GLuint dstName + GLenum dstTarget + GLint dstLevel + GLint dstX + GLint dstY + GLint dstZ + GLsizei srcWidth + GLsizei srcHeight + GLsizei srcDepth + GLsizei signalSemaphoreCount + const GLuint *signalSemaphoreArray + const GLuint64 *signalValueArray + void glAsyncMarkerSGIX GLuint marker @@ -10563,12 +11676,12 @@ typedef unsigned int GLhandleARB; void glBeginConditionalRender GLuint id - GLenum mode + GLenum mode void glBeginConditionalRenderNV GLuint id - GLenum mode + GLenum mode @@ -11433,14 +12546,14 @@ typedef unsigned int GLhandleARB; GLenum target GLsizeiptr size const void *data - GLbitfield flags + GLbitfield flags void glBufferStorageEXT GLenum target GLsizeiptr size const void *data - GLbitfield flags + GLbitfield flags @@ -11449,7 +12562,7 @@ typedef unsigned int GLhandleARB; GLintptr offset GLsizeiptr size GLeglClientBufferEXT clientBuffer - GLbitfield flags + GLbitfield flags void glBufferStorageMemEXT @@ -11557,7 +12670,7 @@ typedef unsigned int GLhandleARB; void glClearBufferSubData - GLenum target + GLenum target GLenum internalformat GLintptr offset GLsizeiptr size @@ -11804,6 +12917,12 @@ typedef unsigned int GLhandleARB; void glClientAttribDefaultEXT GLbitfield mask + + void glClientWaitSemaphoreui64NVX + GLsizei fenceObjectCount + const GLuint *semaphoreArray + const GLuint64 *fenceValueArray + GLenum glClientWaitSync GLsync sync @@ -13086,13 +14205,13 @@ typedef unsigned int GLhandleARB; void glCopyImageSubData GLuint srcName - GLenum srcTarget + GLenum srcTarget GLint srcLevel GLint srcX GLint srcY GLint srcZ GLuint dstName - GLenum dstTarget + GLenum dstTarget GLint dstLevel GLint dstX GLint dstY @@ -13552,6 +14671,9 @@ typedef unsigned int GLhandleARB; GLsizei n GLuint *pipelines + + GLuint glCreateProgressFenceNVX + void glCreateQueries GLenum target @@ -14328,19 +15450,19 @@ typedef unsigned int GLhandleARB; void glDrawBuffers GLsizei n - const GLenum *bufs + const GLenum *bufs void glDrawBuffersARB GLsizei n - const GLenum *bufs + const GLenum *bufs void glDrawBuffersATI GLsizei n - const GLenum *bufs + const GLenum *bufs @@ -14501,7 +15623,7 @@ typedef unsigned int GLhandleARB; void glDrawElementsInstancedBaseVertexBaseInstance GLenum mode GLsizei count - GLenum type + GLenum type const void *indices GLsizei instancecount GLint basevertex @@ -14511,7 +15633,7 @@ typedef unsigned int GLhandleARB; void glDrawElementsInstancedBaseVertexBaseInstanceEXT GLenum mode GLsizei count - GLenum type + GLenum type const void *indices GLsizei instancecount GLint basevertex @@ -16145,7 +17267,7 @@ typedef unsigned int GLhandleARB; GLsizei bufSize GLsizei *length GLint *size - GLenum *type + GLenum *type GLchar *name @@ -16155,7 +17277,7 @@ typedef unsigned int GLhandleARB; GLsizei maxLength GLsizei *length GLint *size - GLenum *type + GLenum *type GLcharARB *name @@ -16619,20 +17741,20 @@ typedef unsigned int GLhandleARB; void glGetDoubleIndexedvEXT - GLenum target + GLenum target GLuint index GLdouble *data void glGetDoublei_v - GLenum target + GLenum target GLuint index GLdouble *data void glGetDoublei_vEXT - GLenum pname + GLenum pname GLuint index GLdouble *params @@ -16697,34 +17819,34 @@ typedef unsigned int GLhandleARB; void glGetFloatIndexedvEXT - GLenum target + GLenum target GLuint index GLfloat *data void glGetFloati_v - GLenum target + GLenum target GLuint index GLfloat *data void glGetFloati_vEXT - GLenum pname + GLenum pname GLuint index GLfloat *params void glGetFloati_vNV - GLenum target + GLenum target GLuint index GLfloat *data void glGetFloati_vOES - GLenum target + GLenum target GLuint index GLfloat *data @@ -16946,7 +18068,7 @@ typedef unsigned int GLhandleARB; void glGetInteger64i_v - GLenum target + GLenum target GLuint index GLint64 *data @@ -16971,13 +18093,13 @@ typedef unsigned int GLhandleARB; void glGetIntegeri_v - GLenum target + GLenum target GLuint index GLint *data void glGetIntegeri_vEXT - GLenum target + GLenum target GLuint index GLint *data @@ -17533,7 +18655,7 @@ typedef unsigned int GLhandleARB; void glGetObjectLabel - GLenum identifier + GLenum identifier GLuint name GLsizei bufSize GLsizei *length @@ -17809,27 +18931,27 @@ typedef unsigned int GLhandleARB; void glGetPixelTransformParameterfvEXT - GLenum target + GLenum target GLenum pname GLfloat *params void glGetPixelTransformParameterivEXT - GLenum target + GLenum target GLenum pname GLint *params void glGetPointerIndexedvEXT - GLenum target + GLenum target GLuint index void **data void glGetPointeri_vEXT - GLenum pname + GLenum pname GLuint index void **params @@ -18045,7 +19167,7 @@ typedef unsigned int GLhandleARB; GLenum programInterface GLuint index GLsizei propCount - const GLenum *props + const GLenum *props GLsizei bufSize GLsizei *length GLint *params @@ -18126,7 +19248,7 @@ typedef unsigned int GLhandleARB; void glGetQueryIndexediv - GLenum target + GLenum target GLuint index GLenum pname GLint *params @@ -18244,53 +19366,53 @@ typedef unsigned int GLhandleARB; void glGetSamplerParameterIiv GLuint sampler - GLenum pname + GLenum pname GLint *params void glGetSamplerParameterIivEXT GLuint sampler - GLenum pname + GLenum pname GLint *params void glGetSamplerParameterIivOES GLuint sampler - GLenum pname + GLenum pname GLint *params void glGetSamplerParameterIuiv GLuint sampler - GLenum pname + GLenum pname GLuint *params void glGetSamplerParameterIuivEXT GLuint sampler - GLenum pname + GLenum pname GLuint *params void glGetSamplerParameterIuivOES GLuint sampler - GLenum pname + GLenum pname GLuint *params void glGetSamplerParameterfv GLuint sampler - GLenum pname + GLenum pname GLfloat *params void glGetSamplerParameteriv GLuint sampler - GLenum pname + GLenum pname GLint *params @@ -18768,7 +19890,7 @@ typedef unsigned int GLhandleARB; GLsizei bufSize GLsizei *length GLsizei *size - GLenum *type + GLenum *type GLchar *name @@ -18779,7 +19901,7 @@ typedef unsigned int GLhandleARB; GLsizei bufSize GLsizei *length GLsizei *size - GLenum *type + GLenum *type GLchar *name @@ -19835,7 +20957,7 @@ typedef unsigned int GLhandleARB; void glInvalidateFramebuffer GLenum target GLsizei numAttachments - const GLenum *attachments + const GLenum *attachments void glInvalidateNamedFramebufferData @@ -19855,7 +20977,7 @@ typedef unsigned int GLhandleARB; void glInvalidateSubFramebuffer - GLenum target + GLenum target GLsizei numAttachments const GLenum *attachments GLint x @@ -20575,7 +21697,7 @@ typedef unsigned int GLhandleARB; GLenum target GLintptr offset GLsizeiptr length - GLbitfield access + GLbitfield access @@ -20583,7 +21705,7 @@ typedef unsigned int GLhandleARB; GLenum target GLintptr offset GLsizeiptr length - GLbitfield access + GLbitfield access @@ -20661,14 +21783,14 @@ typedef unsigned int GLhandleARB; GLuint buffer GLintptr offset GLsizeiptr length - GLbitfield access + GLbitfield access void *glMapNamedBufferRangeEXT GLuint buffer GLintptr offset GLsizeiptr length - GLbitfield access + GLbitfield access void *glMapObjectBufferATI @@ -21228,7 +22350,7 @@ typedef unsigned int GLhandleARB; void glMultiDrawElementsIndirectCount GLenum mode - GLenum type + GLenum type const void *indirect GLintptr drawcount GLsizei maxdrawcount @@ -21296,7 +22418,7 @@ typedef unsigned int GLhandleARB; void glMultiTexBufferEXT GLenum texunit GLenum target - GLenum internalformat + GLenum internalformat GLuint buffer @@ -22268,6 +23390,27 @@ typedef unsigned int GLhandleARB; GLenum pname GLuint *params + + void glMulticastScissorArrayvNVX + GLuint gpu + GLuint first + GLsizei count + const GLint *v + + + void glMulticastViewportArrayvNVX + GLuint gpu + GLuint first + GLsizei count + const GLfloat *v + + + void glMulticastViewportPositionWScaleNVX + GLuint gpu + GLuint index + GLfloat xcoeff + GLfloat ycoeff + void glMulticastWaitSyncNV GLuint signalGpu @@ -22312,7 +23455,7 @@ typedef unsigned int GLhandleARB; GLuint buffer GLsizeiptr size const void *data - GLbitfield flags + GLbitfield flags void glNamedBufferStorageExternalEXT @@ -22320,14 +23463,14 @@ typedef unsigned int GLhandleARB; GLintptr offset GLsizeiptr size GLeglClientBufferEXT clientBuffer - GLbitfield flags + GLbitfield flags void glNamedBufferStorageEXT GLuint buffer GLsizeiptr size const void *data - GLbitfield flags + GLbitfield flags @@ -25875,65 +27018,65 @@ typedef unsigned int GLhandleARB; void glSamplerParameterIiv GLuint sampler - GLenum pname + GLenum pname const GLint *param void glSamplerParameterIivEXT GLuint sampler - GLenum pname + GLenum pname const GLint *param void glSamplerParameterIivOES GLuint sampler - GLenum pname + GLenum pname const GLint *param void glSamplerParameterIuiv GLuint sampler - GLenum pname + GLenum pname const GLuint *param void glSamplerParameterIuivEXT GLuint sampler - GLenum pname + GLenum pname const GLuint *param void glSamplerParameterIuivOES GLuint sampler - GLenum pname + GLenum pname const GLuint *param void glSamplerParameterf GLuint sampler - GLenum pname + GLenum pname GLfloat param void glSamplerParameterfv GLuint sampler - GLenum pname + GLenum pname const GLfloat *param void glSamplerParameteri GLuint sampler - GLenum pname + GLenum pname GLint param void glSamplerParameteriv GLuint sampler - GLenum pname + GLenum pname const GLint *param @@ -26475,6 +27618,13 @@ typedef unsigned int GLhandleARB; const GLuint *textures const GLenum *dstLayouts + + void glSignalSemaphoreui64NVX + GLuint signalGpu + GLsizei fenceObjectCount + const GLuint *semaphoreArray + const GLuint64 *fenceValueArray + void glSpecializeShader GLuint shader @@ -28581,7 +29731,7 @@ typedef unsigned int GLhandleARB; GLuint program GLsizei count const GLchar *const*varyings - GLenum bufferMode + GLenum bufferMode @@ -29517,6 +30667,10 @@ typedef unsigned int GLhandleARB; const void *pointer GLenum preserve + + void glUploadGpuMaskNVX + GLbitfield mask + void glUseProgram GLuint program @@ -29933,7 +31087,7 @@ typedef unsigned int GLhandleARB; GLuint vaobj GLuint attribindex GLint size - GLenum type + GLenum type GLuint relativeoffset @@ -29941,7 +31095,7 @@ typedef unsigned int GLhandleARB; GLuint vaobj GLuint attribindex GLint size - GLenum type + GLenum type GLuint relativeoffset @@ -30063,7 +31217,7 @@ typedef unsigned int GLhandleARB; GLuint vaobj GLuint attribindex GLint size - GLenum type + GLenum type GLboolean normalized GLuint relativeoffset @@ -30072,7 +31226,7 @@ typedef unsigned int GLhandleARB; GLuint vaobj GLuint attribindex GLint size - GLenum type + GLenum type GLuint relativeoffset @@ -30081,7 +31235,7 @@ typedef unsigned int GLhandleARB; GLuint buffer GLuint index GLint size - GLenum type + GLenum type GLsizei stride GLintptr offset @@ -30090,7 +31244,7 @@ typedef unsigned int GLhandleARB; GLuint vaobj GLuint attribindex GLint size - GLenum type + GLenum type GLuint relativeoffset @@ -30099,7 +31253,7 @@ typedef unsigned int GLhandleARB; GLuint buffer GLuint index GLint size - GLenum type + GLenum type GLsizei stride GLintptr offset @@ -30939,7 +32093,7 @@ typedef unsigned int GLhandleARB; void glVertexAttribFormat GLuint attribindex GLint size - GLenum type + GLenum type GLboolean normalized GLuint relativeoffset @@ -30947,7 +32101,7 @@ typedef unsigned int GLhandleARB; void glVertexAttribFormatNV GLuint index GLint size - GLenum type + GLenum type GLboolean normalized GLsizei stride @@ -31215,14 +32369,14 @@ typedef unsigned int GLhandleARB; void glVertexAttribIFormat GLuint attribindex GLint size - GLenum type + GLenum type GLuint relativeoffset void glVertexAttribIFormatNV GLuint index GLint size - GLenum type + GLenum type GLsizei stride @@ -31448,14 +32602,14 @@ typedef unsigned int GLhandleARB; void glVertexAttribLFormat GLuint attribindex GLint size - GLenum type + GLenum type GLuint relativeoffset void glVertexAttribLFormatNV GLuint index GLint size - GLenum type + GLenum type GLsizei stride @@ -32100,6 +33254,13 @@ typedef unsigned int GLhandleARB; const GLuint *textures const GLenum *srcLayouts + + void glWaitSemaphoreui64NVX + GLuint waitGpu + GLsizei fenceObjectCount + const GLuint *semaphoreArray + const GLuint64 *fenceValueArray + void glWaitSync GLsync sync @@ -32575,6 +33736,18 @@ typedef unsigned int GLhandleARB; void glSignalVkFenceNV GLuint64 vkFence + + void glFramebufferParameteriMESA + GLenum target + GLenum pname + GLint param + + + void glGetFramebufferParameterivMESA + GLenum target + GLenum pname + GLint *params + @@ -41626,7 +42799,7 @@ typedef unsigned int GLhandleARB; - + @@ -42996,6 +44169,7 @@ typedef unsigned int GLhandleARB; + @@ -44273,6 +45447,9 @@ typedef unsigned int GLhandleARB; + + + @@ -45195,6 +46372,7 @@ typedef unsigned int GLhandleARB; + @@ -46143,6 +47321,22 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + @@ -46228,6 +47422,8 @@ typedef unsigned int GLhandleARB; + + @@ -46288,7 +47484,6 @@ typedef unsigned int GLhandleARB; - @@ -46799,7 +47994,7 @@ typedef unsigned int GLhandleARB; - + @@ -47084,6 +48279,25 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + @@ -47106,7 +48320,7 @@ typedef unsigned int GLhandleARB; - + @@ -47146,14 +48360,8 @@ typedef unsigned int GLhandleARB; - - - - - - @@ -47161,6 +48369,14 @@ typedef unsigned int GLhandleARB; + + + + + + + + @@ -47659,7 +48875,7 @@ typedef unsigned int GLhandleARB; - + @@ -47699,7 +48915,7 @@ typedef unsigned int GLhandleARB; - + @@ -47742,7 +48958,12 @@ typedef unsigned int GLhandleARB; - + + + + + + @@ -47751,7 +48972,7 @@ typedef unsigned int GLhandleARB; - + @@ -50180,5 +51401,6 @@ typedef unsigned int GLhandleARB; + diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 8377f3ed936..2e55af8b711 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -204,6 +204,7 @@ EXT(ATI_texture_env_combine3 , ATI_texture_env_combine3 EXT(ATI_texture_float , ARB_texture_float , GLL, GLC, x , x , 2002) EXT(ATI_texture_mirror_once , ATI_texture_mirror_once , GLL, GLC, x , x , 2006) +EXT(EXT_EGL_sync , dummy_true , GLL, GLC, x , x , 2019) EXT(EXT_abgr , dummy_true , GLL, GLC, x , x , 1995) EXT(EXT_base_instance , ARB_base_instance , x , x , x , 30, 2014) EXT(EXT_bgra , dummy_true , GLL, x , x , x , 1995) @@ -354,7 +355,6 @@ EXT(KHR_texture_compression_astc_hdr , KHR_texture_compression_astc_hdr EXT(KHR_texture_compression_astc_ldr , KHR_texture_compression_astc_ldr , GLL, GLC, x , ES2, 2012) EXT(KHR_texture_compression_astc_sliced_3d , KHR_texture_compression_astc_sliced_3d , GLL, GLC, x , ES2, 2015) -EXT(MESA_EGL_sync , dummy_true , GLL, GLC, x , x , 2019) EXT(MESA_framebuffer_flip_y , MESA_framebuffer_flip_y , 43, 43, x , 31, 2018) EXT(MESA_pack_invert , MESA_pack_invert , GLL, GLC, x , x , 2002) EXT(MESA_shader_integer_functions , MESA_shader_integer_functions , GLL, GLC, x , 30, 2016) -- 2.30.2