Merge pull request #277 from hfink-daqri/gl43-enable-framebuffer-flip-y-ext
Extend GL_MESA_framebuffer_flip_y to GL 4.3+
diff --git a/api/GL/glcorearb.h b/api/GL/glcorearb.h
index b43ac30..cf6fca8 100755
--- a/api/GL/glcorearb.h
+++ b/api/GL/glcorearb.h
@@ -4744,6 +4744,11 @@
#endif
#endif /* GL_INTEL_performance_query */
+#ifndef GL_MESA_framebuffer_flip_y
+#define GL_MESA_framebuffer_flip_y 1
+#define GL_FRAMEBUFFER_FLIP_Y_MESA 0x8BBB
+#endif /* GL_MESA_framebuffer_flip_y */
+
#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 d72cc75..2716c43 100644
--- a/api/GL/glext.h
+++ b/api/GL/glext.h
@@ -51,7 +51,7 @@
#define GLAPI extern
#endif
-#define GL_GLEXT_VERSION 20190524
+#define GL_GLEXT_VERSION 20190605
#include <KHR/khrplatform.h>
@@ -9259,6 +9259,11 @@
#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
#endif /* GL_MESAX_texture_stack */
+#ifndef GL_MESA_framebuffer_flip_y
+#define GL_MESA_framebuffer_flip_y 1
+#define GL_FRAMEBUFFER_FLIP_Y_MESA 0x8BBB
+#endif /* GL_MESA_framebuffer_flip_y */
+
#ifndef GL_MESA_pack_invert
#define GL_MESA_pack_invert 1
#define GL_PACK_INVERT_MESA 0x8758
diff --git a/api/GL/glxext.h b/api/GL/glxext.h
index f250ccc..2f1c717 100755
--- a/api/GL/glxext.h
+++ b/api/GL/glxext.h
@@ -34,7 +34,7 @@
** https://github.com/KhronosGroup/OpenGL-Registry
*/
-#define GLX_GLXEXT_VERSION 20190524
+#define GLX_GLXEXT_VERSION 20190605
/* Generated C header for:
* API: glx
diff --git a/api/GL/wgl.h b/api/GL/wgl.h
index 46d1881..f68838c 100644
--- a/api/GL/wgl.h
+++ b/api/GL/wgl.h
@@ -39,7 +39,7 @@
#include <windows.h>
#endif
-/* Generated on date 20190524 */
+/* Generated on date 20190605 */
/* Generated C header for:
* API: wgl
diff --git a/api/GL/wglext.h b/api/GL/wglext.h
index 5c858df..657b812 100755
--- a/api/GL/wglext.h
+++ b/api/GL/wglext.h
@@ -39,7 +39,7 @@
#include <windows.h>
#endif
-#define WGL_WGLEXT_VERSION 20190524
+#define WGL_WGLEXT_VERSION 20190605
/* Generated C header for:
* API: wgl
diff --git a/api/GLES/gl.h b/api/GLES/gl.h
index 0d9022d..3f04299 100644
--- a/api/GLES/gl.h
+++ b/api/GLES/gl.h
@@ -36,7 +36,7 @@
#include <GLES/glplatform.h>
-/* Generated on date 20190524 */
+/* Generated on date 20190605 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES/glext.h b/api/GLES/glext.h
index 808daad..0ed2713 100644
--- a/api/GLES/glext.h
+++ b/api/GLES/glext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20190524 */
+/* Generated on date 20190605 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h
index 7407957..76fd3c4 100644
--- a/api/GLES2/gl2.h
+++ b/api/GLES2/gl2.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20190524 */
+/* Generated on date 20190605 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h
index 7305a16..04e902f 100644
--- a/api/GLES2/gl2ext.h
+++ b/api/GLES2/gl2ext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20190524 */
+/* Generated on date 20190605 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h
index 70b33a7..121e9cb 100644
--- a/api/GLES3/gl3.h
+++ b/api/GLES3/gl3.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20190524 */
+/* Generated on date 20190605 */
/* Generated C header for:
* API: gles2
diff --git a/extensions/MESA/MESA_framebuffer_flip_y.txt b/extensions/MESA/MESA_framebuffer_flip_y.txt
index d160232..0866203 100644
--- a/extensions/MESA/MESA_framebuffer_flip_y.txt
+++ b/extensions/MESA/MESA_framebuffer_flip_y.txt
@@ -15,6 +15,7 @@
Fritz Koenig, Google
Kristian Høgsberg, Google
Chad Versace, Google
+ Heinrich Fink, DAQRI
Status
@@ -22,15 +23,16 @@
Version
- Version 1, June 7, 2018
+ Version 2, June 4, 2019
Number
+ OpenGL Extension #540
OpenGL ES Extension #302
Dependencies
- OpenGL ES 3.1 is required, for FramebufferParameteri.
+ OpenGL ES 3.1 or OpenGL 4.3 is required, for FramebufferParameteri.
Overview
@@ -79,5 +81,8 @@
Revision History
+ Version 2, June, 2019
+ Enable extension for OpenGL 4.3 and beyond
+
Version 1, June, 2018
Initial draft (Fritz Koenig)
diff --git a/extensions/glext.php b/extensions/glext.php
index 2fa2314..2c238f4 100644
--- a/extensions/glext.php
+++ b/extensions/glext.php
@@ -1017,4 +1017,6 @@
</li>
<li value=539><a href="extensions/EXT/EXT_texture_shadow_lod.txt">GL_EXT_texture_shadow_lod</a>
</li>
+<li value=540><a href="extensions/MESA/MESA_framebuffer_flip_y.txt">GL_MESA_framebuffer_flip_y</a>
+</li>
</ol>
diff --git a/extensions/registry.py b/extensions/registry.py
index 1240db3..521efd4 100644
--- a/extensions/registry.py
+++ b/extensions/registry.py
@@ -2967,6 +2967,7 @@
'url' : 'extensions/MESA/GLX_MESA_copy_sub_buffer.txt',
},
'GL_MESA_framebuffer_flip_y' : {
+ 'number' : 540,
'esnumber' : 302,
'flags' : { 'public' },
'supporters' : { 'MESA' },
diff --git a/xml/gl.xml b/xml/gl.xml
index 057358a..a25e941 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -46966,7 +46966,7 @@
<enum name="GL_TEXTURE_2D_STACK_BINDING_MESAX"/>
</require>
</extension>
- <extension name="GL_MESA_framebuffer_flip_y" supported="gles2">
+ <extension name="GL_MESA_framebuffer_flip_y" supported="gl|glcore|gles2">
<require>
<enum name="GL_FRAMEBUFFER_FLIP_Y_MESA"/>
</require>