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 <eric.engestrom@intel.com> Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Heinrich Fink
Daniel Stone
parent
2bfcf04345
commit
df8602f4b5
|
|
@ -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)
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ extern "C" {
|
|||
#define GLAPI extern
|
||||
#endif
|
||||
|
||||
#define GL_GLEXT_VERSION 20190728
|
||||
#define GL_GLEXT_VERSION 20190911
|
||||
|
||||
#include <KHR/khrplatform.h>
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue