Google Git
Sign in
skia/external/github.com/KhronosGroup/OpenGL-Registry/refs/heads/108-cleanup-xml^!/.
commit
76235f2bcab2542c3f07888d3e4cbb53654c4880
[log]
author
Jon Leech <oddhack@sonic.net>
Tue Oct 10 02:25:26 2017 -0700
committer
Jon Leech <oddhack@sonic.net>
Tue Oct 10 02:25:26 2017 -0700
tree
611dbaacc979aef4f2ac285a9d56ebf4b0ffba8b
parent
653f22036185d347881fdd2be7605729a5553c28 [diff]
This moves some of the new enum groups introduced in #108 into distinct
\<group> tags and removes the value= attributes in those groups, because
the scripts don't allow redefining enums (even benignly) inside \<enums>
tags.

I'm not certain what to do with the additions to ShaderType and they
have just been reverted, for the moment. Probably best is to use a
different group name (ShaderStages?) in a \<group> tag including all of
them.

Please make sure that after proposing a new PR addressing this, 'make'
executes and regenerates the headers, unchanged other than the revision
dates, without reporting any warnings or errors.

diff --git a/api/GL/glext.h b/api/GL/glext.h
index 96e3daf..370f4af 100644
--- a/api/GL/glext.h
+++ b/api/GL/glext.h

@@ -51,7 +51,7 @@
 #define GLAPI extern
 #endif
 
-#define GL_GLEXT_VERSION 20170924
+#define GL_GLEXT_VERSION 20171010
 
 /* Generated C header for:
  * API: gl

diff --git a/api/GLES/gl.h b/api/GLES/gl.h
index 9db95b5..ff8e0cd 100644
--- a/api/GLES/gl.h
+++ b/api/GLES/gl.h

@@ -36,7 +36,7 @@
 
 #include <GLES/glplatform.h>
 
-/* Generated on date 20170926 */
+/* Generated on date 20171010 */
 
 /* Generated C header for:
  * API: gles1

diff --git a/api/GLES/glext.h b/api/GLES/glext.h
index 84b2baf..f5bcf47 100644
--- a/api/GLES/glext.h
+++ b/api/GLES/glext.h

@@ -38,7 +38,7 @@
 #define GL_APIENTRYP GL_APIENTRY*
 #endif
 
-/* Generated on date 20170926 */
+/* Generated on date 20171010 */
 
 /* Generated C header for:
  * API: gles1

diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h
index a2bb839..3fb4d07 100644
--- a/api/GLES2/gl2.h
+++ b/api/GLES2/gl2.h

@@ -44,7 +44,7 @@
 #define GL_GLES_PROTOTYPES 1
 #endif
 
-/* Generated on date 20170926 */
+/* Generated on date 20171010 */
 
 /* Generated C header for:
  * API: gles2

diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h
index 7329ac7..724b5d4 100644
--- a/api/GLES2/gl2ext.h
+++ b/api/GLES2/gl2ext.h

@@ -38,7 +38,7 @@
 #define GL_APIENTRYP GL_APIENTRY*
 #endif
 
-/* Generated on date 20170929 */
+/* Generated on date 20171010 */
 
 /* Generated C header for:
  * API: gles2

diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h
index 58fa050..b03166c 100644
--- a/api/GLES3/gl3.h
+++ b/api/GLES3/gl3.h

@@ -44,7 +44,7 @@
 #define GL_GLES_PROTOTYPES 1
 #endif
 
-/* Generated on date 20170926 */
+/* Generated on date 20171010 */
 
 /* Generated C header for:
  * API: gles2

diff --git a/xml/gl.xml b/xml/gl.xml
index b592fc2..cb80976 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml

@@ -3579,38 +3579,6 @@
         <enum value="0xFFFF" name="GL_TRACE_ALL_BITS_MESA"/>
     </enums>
 
-    <enums namespace="GL" group="PathFontStyle" type="bitmask">
-        <enum value="0" name="GL_NONE"/>
-        <enum value="0x01" name="GL_BOLD_BIT_NV"/>
-        <enum value="0x02" name="GL_ITALIC_BIT_NV"/>
-    </enums>
-
-    <enums namespace="GL" group="PathMetricMask" type="bitmask">
-        <enum value="0x01" name="GL_GLYPH_WIDTH_BIT_NV"/>
-        <enum value="0x02" name="GL_GLYPH_HEIGHT_BIT_NV"/>
-        <enum value="0x04" name="GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV"/>
-        <enum value="0x08" name="GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV"/>
-        <enum value="0x10" name="GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV"/>
-        <enum value="0x20" name="GL_GLYPH_VERTICAL_BEARING_X_BIT_NV"/>
-        <enum value="0x40" name="GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV"/>
-        <enum value="0x80" name="GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV"/>
-        <enum value="0x100" name="GL_GLYPH_HAS_KERNING_BIT_NV"/>
-        <enum value="0x00010000" name="GL_FONT_X_MIN_BOUNDS_BIT_NV"/>
-        <enum value="0x00020000" name="GL_FONT_Y_MIN_BOUNDS_BIT_NV"/>
-        <enum value="0x00040000" name="GL_FONT_X_MAX_BOUNDS_BIT_NV"/>
-        <enum value="0x00080000" name="GL_FONT_Y_MAX_BOUNDS_BIT_NV"/>
-        <enum value="0x00100000" name="GL_FONT_UNITS_PER_EM_BIT_NV"/>
-        <enum value="0x00200000" name="GL_FONT_ASCENDER_BIT_NV"/>
-        <enum value="0x00400000" name="GL_FONT_DESCENDER_BIT_NV"/>
-        <enum value="0x00800000" name="GL_FONT_HEIGHT_BIT_NV"/>
-        <enum value="0x01000000" name="GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV"/>
-        <enum value="0x02000000" name="GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV"/>
-        <enum value="0x04000000" name="GL_FONT_UNDERLINE_POSITION_BIT_NV"/>
-        <enum value="0x08000000" name="GL_FONT_UNDERLINE_THICKNESS_BIT_NV"/>
-        <enum value="0x10000000" name="GL_FONT_HAS_KERNING_BIT_NV"/>
-        <enum value="0x20000000" name="GL_FONT_NUM_GLYPH_INDICES_BIT_NV"/>
-    </enums>
-
     <enums namespace="GL" group="PathRenderingMaskNV" type="bitmask">
         <enum value="0x01" name="GL_BOLD_BIT_NV"/>
         <enum value="0x02" name="GL_ITALIC_BIT_NV"/>
@@ -7701,10 +7669,6 @@
         <enum value="0x8B31" name="GL_VERTEX_SHADER"/>
         <enum value="0x8B31" name="GL_VERTEX_SHADER_ARB"/>
             <unused start="0x8B32" end="0x8B3F" comment="For shader types"/>
-        <enum value="0x8DD9" name="GL_GEOMETRY_SHADER"/>
-        <enum value="0x8E87" name="GL_TESS_EVALUATION_SHADER"/>
-        <enum value="0x8E88" name="GL_TESS_CONTROL_SHADER"/>
-        <enum value="0x91B9" name="GL_COMPUTE_SHADER"/>
     </enums>
 
     <enums namespace="GL" start="0x8B40" end="0x8B47" group="ContainerType" vendor="ARB">