Merge pull request #319 from 1ace/regen-gles3
regenerate GLES3 & GLSC2 headers
diff --git a/extensions/KHR/KHR_texture_compression_astc_hdr.txt b/extensions/KHR/KHR_texture_compression_astc_hdr.txt
index 2231337..9b4422d 100644
--- a/extensions/KHR/KHR_texture_compression_astc_hdr.txt
+++ b/extensions/KHR/KHR_texture_compression_astc_hdr.txt
@@ -946,7 +946,7 @@
if Q[2:1] = 11
q2 = 4; C = { Q[4:3], ~Q[6:5], Q[0] }
else
- q2 = T[6:5]; C = Q[4:0]
+ q2 = Q[6:5]; C = Q[4:0]
if C[2:0] = 101
q1 = 4; q0 = C[4:3]
diff --git a/extensions/OES/OES_texture_compression_astc.txt b/extensions/OES/OES_texture_compression_astc.txt
index bbdb5cc..0514f65 100644
--- a/extensions/OES/OES_texture_compression_astc.txt
+++ b/extensions/OES/OES_texture_compression_astc.txt
@@ -1065,7 +1065,7 @@
if Q[2:1] = 11
q2 = 4; C = { Q[4:3], ~Q[6:5], Q[0] }
else
- q2 = T[6:5]; C = Q[4:0]
+ q2 = Q[6:5]; C = Q[4:0]
if C[2:0] = 101
q1 = 4; q0 = C[4:3]
diff --git a/xml/gl.xml b/xml/gl.xml
index 28f58f8..4f1e43b 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -2940,6 +2940,8 @@
</group>
<group name="ReadBufferMode">
+ <enum name="GL_NONE"/>
+ <enum name="GL_NONE_OES"/>
<enum name="GL_AUX0"/>
<enum name="GL_AUX1"/>
<enum name="GL_AUX2"/>
@@ -3316,9 +3318,6 @@
</group>
<group name="FramebufferAttachment">
- <enum name="GL_MAX_COLOR_ATTACHMENTS"/>
- <enum name="GL_MAX_COLOR_ATTACHMENTS_EXT"/>
- <enum name="GL_MAX_COLOR_ATTACHMENTS_NV"/>
<enum name="GL_COLOR_ATTACHMENT0"/>
<enum name="GL_COLOR_ATTACHMENT0_EXT"/>
<enum name="GL_COLOR_ATTACHMENT0_NV"/>
@@ -3388,6 +3387,87 @@
<enum name="GL_DEPTH_STENCIL_ATTACHMENT"/>
<enum name="GL_DEPTH_ATTACHMENT_EXT"/>
<enum name="GL_DEPTH_ATTACHMENT_OES"/>
+ <enum name="GL_STENCIL_ATTACHMENT"/>
+ <enum name="GL_STENCIL_ATTACHMENT_EXT"/>
+ <enum name="GL_STENCIL_ATTACHMENT_OES"/>
+ </group>
+
+ <group name="InvalidateFramebufferAttachment">
+ <enum name="GL_COLOR_ATTACHMENT0"/>
+ <enum name="GL_COLOR_ATTACHMENT0_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT0_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT0_OES"/>
+ <enum name="GL_COLOR_ATTACHMENT1"/>
+ <enum name="GL_COLOR_ATTACHMENT1_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT1_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT2"/>
+ <enum name="GL_COLOR_ATTACHMENT2_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT2_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT3"/>
+ <enum name="GL_COLOR_ATTACHMENT3_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT3_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT4"/>
+ <enum name="GL_COLOR_ATTACHMENT4_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT4_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT5"/>
+ <enum name="GL_COLOR_ATTACHMENT5_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT5_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT6"/>
+ <enum name="GL_COLOR_ATTACHMENT6_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT6_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT7"/>
+ <enum name="GL_COLOR_ATTACHMENT7_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT7_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT8"/>
+ <enum name="GL_COLOR_ATTACHMENT8_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT8_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT9"/>
+ <enum name="GL_COLOR_ATTACHMENT9_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT9_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT10"/>
+ <enum name="GL_COLOR_ATTACHMENT10_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT10_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT11"/>
+ <enum name="GL_COLOR_ATTACHMENT11_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT11_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT12"/>
+ <enum name="GL_COLOR_ATTACHMENT12_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT12_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT13"/>
+ <enum name="GL_COLOR_ATTACHMENT13_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT13_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT14"/>
+ <enum name="GL_COLOR_ATTACHMENT14_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT14_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT15"/>
+ <enum name="GL_COLOR_ATTACHMENT15_EXT"/>
+ <enum name="GL_COLOR_ATTACHMENT15_NV"/>
+ <enum name="GL_COLOR_ATTACHMENT16"/>
+ <enum name="GL_COLOR_ATTACHMENT17"/>
+ <enum name="GL_COLOR_ATTACHMENT18"/>
+ <enum name="GL_COLOR_ATTACHMENT19"/>
+ <enum name="GL_COLOR_ATTACHMENT20"/>
+ <enum name="GL_COLOR_ATTACHMENT21"/>
+ <enum name="GL_COLOR_ATTACHMENT22"/>
+ <enum name="GL_COLOR_ATTACHMENT23"/>
+ <enum name="GL_COLOR_ATTACHMENT24"/>
+ <enum name="GL_COLOR_ATTACHMENT25"/>
+ <enum name="GL_COLOR_ATTACHMENT26"/>
+ <enum name="GL_COLOR_ATTACHMENT27"/>
+ <enum name="GL_COLOR_ATTACHMENT28"/>
+ <enum name="GL_COLOR_ATTACHMENT29"/>
+ <enum name="GL_COLOR_ATTACHMENT30"/>
+ <enum name="GL_COLOR_ATTACHMENT31"/>
+ <enum name="GL_DEPTH_ATTACHMENT"/>
+ <enum name="GL_DEPTH_STENCIL_ATTACHMENT"/>
+ <enum name="GL_DEPTH_ATTACHMENT_EXT"/>
+ <enum name="GL_DEPTH_ATTACHMENT_OES"/>
+ <enum name="GL_STENCIL"/>
+ <enum name="GL_STENCIL_ATTACHMENT_EXT"/>
+ <enum name="GL_STENCIL_ATTACHMENT_OES"/>
+ <enum name="GL_COLOR"/>
+ <enum name="GL_DEPTH"/>
+ <enum name="GL_STENCIL"/>
</group>
<group name="RenderbufferTarget">
@@ -11424,6 +11504,10 @@
<unused start="0x96A4" end="0x96AF" vendor="Qualcomm"/>
</enums>
+ <enums namespace="GL" start="0x96B0" end="0x96BF" vendor="ANGLE" comment="github pull request">
+ <unused start="0x96B0" end="0x96BF" vendor="ANGLE"/>
+ </enums>
+
<!-- Enums reservable for future use. To reserve a new range, allocate one
or more multiples of 16 starting at the lowest available point in this
block and note it in a new <enums> block immediately above.
@@ -11433,8 +11517,8 @@
file) File requests in the Khronos Bugzilla, OpenGL project, Registry
component. -->
- <enums namespace="GL" start="0x96B0" end="99999" vendor="ARB" comment="RESERVED FOR FUTURE ALLOCATIONS BY KHRONOS">
- <unused start="0x96B0" end="99999" comment="RESERVED"/>
+ <enums namespace="GL" start="0x96C0" end="99999" vendor="ARB" comment="RESERVED FOR FUTURE ALLOCATIONS BY KHRONOS">
+ <unused start="0x96C0" end="99999" comment="RESERVED"/>
</enums>
<!-- Historical large block allocations, all unused except (in older days) by IBM -->
@@ -15391,9 +15475,9 @@
</command>
<command>
<proto>void <name>glDiscardFramebufferEXT</name></proto>
- <param><ptype>GLenum</ptype> <name>target</name></param>
+ <param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
<param><ptype>GLsizei</ptype> <name>numAttachments</name></param>
- <param len="numAttachments">const <ptype>GLenum</ptype> *<name>attachments</name></param>
+ <param group="InvalidateFramebufferAttachment" len="numAttachments">const <ptype>GLenum</ptype> *<name>attachments</name></param>
</command>
<command>
<proto>void <name>glDispatchCompute</name></proto>
@@ -21005,7 +21089,7 @@
<proto>void <name>glInvalidateFramebuffer</name></proto>
<param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
<param><ptype>GLsizei</ptype> <name>numAttachments</name></param>
- <param group="FramebufferAttachment" len="numAttachments">const <ptype>GLenum</ptype> *<name>attachments</name></param>
+ <param group="InvalidateFramebufferAttachment" len="numAttachments">const <ptype>GLenum</ptype> *<name>attachments</name></param>
</command>
<command>
<proto>void <name>glInvalidateNamedFramebufferData</name></proto>
@@ -21027,7 +21111,7 @@
<proto>void <name>glInvalidateSubFramebuffer</name></proto>
<param group="FramebufferTarget"><ptype>GLenum</ptype> <name>target</name></param>
<param><ptype>GLsizei</ptype> <name>numAttachments</name></param>
- <param len="numAttachments" group="FramebufferAttachment">const <ptype>GLenum</ptype> *<name>attachments</name></param>
+ <param len="numAttachments" group="InvalidateFramebufferAttachment">const <ptype>GLenum</ptype> *<name>attachments</name></param>
<param><ptype>GLint</ptype> <name>x</name></param>
<param><ptype>GLint</ptype> <name>y</name></param>
<param><ptype>GLsizei</ptype> <name>width</name></param>
