Merge pull request #400 from tsuoranta/buffer-group-renames
Use BufferPNameARB and BufferPointerNameARB as enum group
diff --git a/api/GL/glcorearb.h b/api/GL/glcorearb.h
index 8d691cc..7a44138 100755
--- a/api/GL/glcorearb.h
+++ b/api/GL/glcorearb.h
@@ -4770,6 +4770,11 @@
#endif
#endif /* GL_INTEL_performance_query */
+#ifndef GL_MESA_framebuffer_flip_x
+#define GL_MESA_framebuffer_flip_x 1
+#define GL_FRAMEBUFFER_FLIP_X_MESA 0x8BBC
+#endif /* GL_MESA_framebuffer_flip_x */
+
#ifndef GL_MESA_framebuffer_flip_y
#define GL_MESA_framebuffer_flip_y 1
#define GL_FRAMEBUFFER_FLIP_Y_MESA 0x8BBB
@@ -4781,6 +4786,11 @@
#endif
#endif /* GL_MESA_framebuffer_flip_y */
+#ifndef GL_MESA_framebuffer_swap_xy
+#define GL_MESA_framebuffer_swap_xy 1
+#define GL_FRAMEBUFFER_SWAP_XY_MESA 0x8BBD
+#endif /* GL_MESA_framebuffer_swap_xy */
+
#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/api/GL/glext.h b/api/GL/glext.h
index e7126ce..4f395f6 100644
--- a/api/GL/glext.h
+++ b/api/GL/glext.h
@@ -51,7 +51,7 @@
#define GLAPI extern
#endif
-#define GL_GLEXT_VERSION 20200408
+#define GL_GLEXT_VERSION 20200423
#include <KHR/khrplatform.h>
@@ -9285,6 +9285,11 @@
#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
#endif /* GL_MESAX_texture_stack */
+#ifndef GL_MESA_framebuffer_flip_x
+#define GL_MESA_framebuffer_flip_x 1
+#define GL_FRAMEBUFFER_FLIP_X_MESA 0x8BBC
+#endif /* GL_MESA_framebuffer_flip_x */
+
#ifndef GL_MESA_framebuffer_flip_y
#define GL_MESA_framebuffer_flip_y 1
#define GL_FRAMEBUFFER_FLIP_Y_MESA 0x8BBB
@@ -9296,6 +9301,11 @@
#endif
#endif /* GL_MESA_framebuffer_flip_y */
+#ifndef GL_MESA_framebuffer_swap_xy
+#define GL_MESA_framebuffer_swap_xy 1
+#define GL_FRAMEBUFFER_SWAP_XY_MESA 0x8BBD
+#endif /* GL_MESA_framebuffer_swap_xy */
+
#ifndef GL_MESA_pack_invert
#define GL_MESA_pack_invert 1
#define GL_PACK_INVERT_MESA 0x8758
diff --git a/api/GLES/gl.h b/api/GLES/gl.h
index ce84100..914b8e7 100644
--- a/api/GLES/gl.h
+++ b/api/GLES/gl.h
@@ -36,7 +36,7 @@
#include <GLES/glplatform.h>
-/* Generated on date 20200408 */
+/* Generated on date 20200423 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES/glext.h b/api/GLES/glext.h
index a12781e..a51277c 100644
--- a/api/GLES/glext.h
+++ b/api/GLES/glext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20200408 */
+/* Generated on date 20200423 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h
index aff0a31..00aa7fc 100644
--- a/api/GLES2/gl2.h
+++ b/api/GLES2/gl2.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20200408 */
+/* Generated on date 20200423 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h
index e3394d2..b573a9b 100644
--- a/api/GLES2/gl2ext.h
+++ b/api/GLES2/gl2ext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20200408 */
+/* Generated on date 20200423 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h
index 374d957..d96042b 100644
--- a/api/GLES3/gl3.h
+++ b/api/GLES3/gl3.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20200408 */
+/* Generated on date 20200423 */
/* Generated C header for:
* API: gles2
diff --git a/xml/gl.xml b/xml/gl.xml
index 4c4666b..d66f945 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -7524,7 +7524,7 @@
<enum value="0x84FF" name="GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT" alias="GL_MAX_TEXTURE_MAX_ANISOTROPY"/>
<enum value="0x8500" name="GL_TEXTURE_FILTER_CONTROL"/>
<enum value="0x8500" name="GL_TEXTURE_FILTER_CONTROL_EXT"/>
- <enum value="0x8501" name="GL_TEXTURE_LOD_BIAS" group="TextureParameterName"/>
+ <enum value="0x8501" name="GL_TEXTURE_LOD_BIAS" group="TextureParameterName,SamplerParameterF"/>
<enum value="0x8501" name="GL_TEXTURE_LOD_BIAS_EXT"/>
<enum value="0x8502" name="GL_MODELVIEW1_STACK_DEPTH_EXT"/>
<enum value="0x8503" name="GL_COMBINE4_NV"/>
@@ -9379,7 +9379,7 @@
<enum value="0x8C29" name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB"/>
<enum value="0x8C29" name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT"/>
<enum value="0x8C29" name="GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_OES"/>
- <enum value="0x8C2A" name="GL_TEXTURE_BUFFER" group="CopyBufferSubDataTarget,BufferTargetARB,BufferStorageTarget"/>
+ <enum value="0x8C2A" name="GL_TEXTURE_BUFFER" group="TextureTarget,CopyBufferSubDataTarget,BufferTargetARB,BufferStorageTarget"/>
<enum value="0x8C2A" name="GL_TEXTURE_BUFFER_ARB"/>
<enum value="0x8C2A" name="GL_TEXTURE_BUFFER_EXT"/>
<enum value="0x8C2A" name="GL_TEXTURE_BUFFER_OES"/>
@@ -10199,10 +10199,10 @@
<enum value="0x8E88" name="GL_TESS_CONTROL_SHADER" group="PipelineParameterName,ShaderType"/>
<enum value="0x8E88" name="GL_TESS_CONTROL_SHADER_EXT"/>
<enum value="0x8E88" name="GL_TESS_CONTROL_SHADER_OES"/>
- <enum value="0x8E89" name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS"/>
+ <enum value="0x8E89" name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS" group="GetPName"/>
<enum value="0x8E89" name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_EXT"/>
<enum value="0x8E89" name="GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_OES"/>
- <enum value="0x8E8A" name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS"/>
+ <enum value="0x8E8A" name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS" group="GetPName"/>
<enum value="0x8E8A" name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_EXT"/>
<enum value="0x8E8A" name="GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_OES"/>
<unused start="0x8E8B" vendor="NV"/>
@@ -10807,7 +10807,7 @@
<enum value="0x9124" name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT"/>
<enum value="0x9124" name="GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_OES"/>
<enum value="0x9125" name="GL_MAX_FRAGMENT_INPUT_COMPONENTS" group="GetPName"/>
- <enum value="0x9126" name="GL_CONTEXT_PROFILE_MASK"/>
+ <enum value="0x9126" name="GL_CONTEXT_PROFILE_MASK" group="GetPName"/>
<enum value="0x9127" name="GL_UNPACK_COMPRESSED_BLOCK_WIDTH"/>
<enum value="0x9128" name="GL_UNPACK_COMPRESSED_BLOCK_HEIGHT"/>
<enum value="0x9129" name="GL_UNPACK_COMPRESSED_BLOCK_DEPTH"/>
@@ -19796,6 +19796,11 @@
<proto><ptype>GLushort</ptype> <name>glGetStageIndexNV</name></proto>
<param group="ShaderType"><ptype>GLenum</ptype> <name>shadertype</name></param>
</command>
+ <!-- These commands represent strings as GLubyte* instead of GLchar* as represented elsewhere.
+ While functionally the same, these commands continue to use GLubyte* as there's no way to
+ change the signature of these commands without potentially breaking lots of applications
+ using these APIs. For more information, see public issue 363:
+ https://github.com/KhronosGroup/OpenGL-Registry/issues/363 -->
<command>
<proto group="String">const <ptype>GLubyte</ptype> *<name>glGetString</name></proto>
<param group="StringName"><ptype>GLenum</ptype> <name>name</name></param>
@@ -47740,7 +47745,7 @@
<enum name="GL_TEXTURE_2D_STACK_BINDING_MESAX"/>
</require>
</extension>
- <extension name="GL_MESA_framebuffer_flip_x" supported="gles2">
+ <extension name="GL_MESA_framebuffer_flip_x" supported="gl|glcore|gles2">
<require>
<enum name="GL_FRAMEBUFFER_FLIP_X_MESA"/>
</require>
@@ -47752,7 +47757,7 @@
<command name="glGetFramebufferParameterivMESA"/>
</require>
</extension>
- <extension name="GL_MESA_framebuffer_swap_xy" supported="gles2">
+ <extension name="GL_MESA_framebuffer_swap_xy" supported="gl|glcore|gles2">
<require>
<enum name="GL_FRAMEBUFFER_SWAP_XY_MESA"/>
</require>
