Merge pull request #302 from KhronosGroup/api113-quad
Fix typo in quad tessellation.
diff --git a/extensions/ARB/ARB_framebuffer_sRGB.txt b/extensions/ARB/ARB_framebuffer_sRGB.txt
index 4dfe402..08b006f 100644
--- a/extensions/ARB/ARB_framebuffer_sRGB.txt
+++ b/extensions/ARB/ARB_framebuffer_sRGB.txt
@@ -21,6 +21,7 @@
Yanjun Zhang, S3 Graphics
Jeremy Sandmel, Apple
Jon Leech
+ Adam Jackson, Red Hat
Contact
@@ -47,8 +48,8 @@
Version
- Date: August 11, 2008
- Revision: 1.2
+ Date: September 19, 2019
+ Revision: 1.3
Number
@@ -111,8 +112,9 @@
New Tokens
- Accepted by the <attribList> parameter of glXChooseVisual, and by
- the <attrib> parameter of glXGetConfig:
+ Accepted by the <attribList> parameter of glXChooseVisual and
+ glXChooseFBConfig, and by the <attrib> parameter of glXGetConfig
+ and glXGetFBConfigAttrib:
GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20B2
@@ -244,7 +246,10 @@
Additions to the GLX Specification
- None
+ If GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB is specified for glXChooseVisual or
+ glXChooseFBConfig, it is treated as an exact match. If it is not specified,
+ it is treated as GLX_DONT_CARE. Sorting of visuals and fbconfigs by
+ GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB is undefined.
Dependencies on ARB_color_buffer_float
@@ -601,6 +606,7 @@
Rev. Date Author Changes
---- -------- -------- -------------------------------------
+ 1.3 09/19/19 ajax Clarify GLX interaction.
1.2 08/11/08 jleech Use per-FBO-attachment state for
sRGB-capable queries, rather then the
EXT's single boolean query for the
diff --git a/extensions/ARB/ARB_texture_multisample.txt b/extensions/ARB/ARB_texture_multisample.txt
index d8fa9b1..915bcab 100644
--- a/extensions/ARB/ARB_texture_multisample.txt
+++ b/extensions/ARB/ARB_texture_multisample.txt
@@ -4,7 +4,7 @@
Name Strings
- ARB_texture_multisample
+ GL_ARB_texture_multisample
Contact
diff --git a/extensions/ARB/ARB_texture_stencil8.txt b/extensions/ARB/ARB_texture_stencil8.txt
index 335b184..d646fe5 100644
--- a/extensions/ARB/ARB_texture_stencil8.txt
+++ b/extensions/ARB/ARB_texture_stencil8.txt
@@ -4,7 +4,7 @@
Name Strings
- ARB_texture_stencil8
+ GL_ARB_texture_stencil8
Contact
diff --git a/extensions/EXT/EXT_shader_image_load_store.txt b/extensions/EXT/EXT_shader_image_load_store.txt
index 5a6cc9b..eb19385 100644
--- a/extensions/EXT/EXT_shader_image_load_store.txt
+++ b/extensions/EXT/EXT_shader_image_load_store.txt
@@ -4,7 +4,7 @@
Name Strings
- EXT_shader_image_load_store
+ GL_EXT_shader_image_load_store
Contact
diff --git a/extensions/NV/NV_explicit_multisample.txt b/extensions/NV/NV_explicit_multisample.txt
index bcbc908..6d05ced 100644
--- a/extensions/NV/NV_explicit_multisample.txt
+++ b/extensions/NV/NV_explicit_multisample.txt
@@ -4,7 +4,7 @@
Name Strings
- NV_explicit_multisample
+ GL_NV_explicit_multisample
Contributors
diff --git a/extensions/NV/NV_texture_multisample.txt b/extensions/NV/NV_texture_multisample.txt
index 7d7f157..dce24b5 100755
--- a/extensions/NV/NV_texture_multisample.txt
+++ b/extensions/NV/NV_texture_multisample.txt
@@ -4,7 +4,7 @@
Name Strings
- NV_texture_multisample
+ GL_NV_texture_multisample
Contact
diff --git a/xml/gl.xml b/xml/gl.xml
index 3a2010f..28f58f8 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -3392,10 +3392,12 @@
<group name="RenderbufferTarget">
<enum name="GL_RENDERBUFFER" />
+ <enum name="GL_RENDERBUFFER_OES" />
</group>
<group name="FramebufferTarget">
<enum name="GL_FRAMEBUFFER" />
+ <enum name="GL_FRAMEBUFFER_OES" />
<enum name="GL_DRAW_FRAMEBUFFER" />
<enum name="GL_READ_FRAMEBUFFER" />
</group>
@@ -3536,15 +3538,41 @@
<group name="RenderbufferParameterName">
<enum name="GL_RENDERBUFFER_WIDTH"/>
+ <enum name="GL_RENDERBUFFER_WIDTH_EXT"/>
+ <enum name="GL_RENDERBUFFER_WIDTH_OES"/>
<enum name="GL_RENDERBUFFER_HEIGHT"/>
+ <enum name="GL_RENDERBUFFER_HEIGHT_EXT"/>
+ <enum name="GL_RENDERBUFFER_HEIGHT_OES"/>
<enum name="GL_RENDERBUFFER_INTERNAL_FORMAT"/>
+ <enum name="GL_RENDERBUFFER_INTERNAL_FORMAT_EXT"/>
+ <enum name="GL_RENDERBUFFER_INTERNAL_FORMAT_OES"/>
<enum name="GL_RENDERBUFFER_SAMPLES"/>
+ <enum name="GL_RENDERBUFFER_SAMPLES_ANGLE"/>
+ <enum name="GL_RENDERBUFFER_SAMPLES_APPLE"/>
+ <enum name="GL_RENDERBUFFER_SAMPLES_EXT"/>
+ <enum name="GL_RENDERBUFFER_SAMPLES_IMG"/>
+ <enum name="GL_RENDERBUFFER_SAMPLES_NV"/>
<enum name="GL_RENDERBUFFER_RED_SIZE"/>
+ <enum name="GL_RENDERBUFFER_RED_SIZE_EXT"/>
+ <enum name="GL_RENDERBUFFER_RED_SIZE_OES"/>
<enum name="GL_RENDERBUFFER_GREEN_SIZE"/>
+ <enum name="GL_RENDERBUFFER_GREEN_SIZE_EXT"/>
+ <enum name="GL_RENDERBUFFER_GREEN_SIZE_OES"/>
<enum name="GL_RENDERBUFFER_BLUE_SIZE"/>
+ <enum name="GL_RENDERBUFFER_BLUE_SIZE_EXT"/>
+ <enum name="GL_RENDERBUFFER_BLUE_SIZE_OES"/>
<enum name="GL_RENDERBUFFER_ALPHA_SIZE"/>
+ <enum name="GL_RENDERBUFFER_ALPHA_SIZE_EXT"/>
+ <enum name="GL_RENDERBUFFER_ALPHA_SIZE_OES"/>
<enum name="GL_RENDERBUFFER_DEPTH_SIZE"/>
+ <enum name="GL_RENDERBUFFER_DEPTH_SIZE_EXT"/>
+ <enum name="GL_RENDERBUFFER_DEPTH_SIZE_OES"/>
<enum name="GL_RENDERBUFFER_STENCIL_SIZE"/>
+ <enum name="GL_RENDERBUFFER_STENCIL_SIZE_EXT"/>
+ <enum name="GL_RENDERBUFFER_STENCIL_SIZE_OES"/>
+ <enum name="GL_RENDERBUFFER_STORAGE_SAMPLES_AMD"/>
+ <enum name="GL_RENDERBUFFER_COVERAGE_SAMPLES_AMD"/>
+ <enum name="GL_RENDERBUFFER_COLOR_SAMPLES_AMD"/>
</group>
<group name="VertexBufferObjectUsage">
@@ -4180,13 +4208,33 @@
<enum name="GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE"/>
<enum name="GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE"/>
<enum name="GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT"/>
<enum name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT"/>
<enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME"/>
- <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES"/>
<enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES"/>
<enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE"/>
- <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES"/>
<enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SCALE_IMG"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT"/>
+ <enum name="GL_FRAMEBUFFER_ATTACHMENT_LAYERED_OES"/>
</group>
<group name="ProgramInterfacePName">
