mesa: Enable GL_MESA_framebuffer_flip_y for GL 4.3

Extend MESA_framebuffer_flip_y to be used with OpenGL versions 4.3 and
higher. OpenGL 4.3 adds FramebufferParameteri needed by this extension.

Reviewed-by: Fritz Koenig <frkoenig@google.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/docs/specs/MESA_framebuffer_flip_y.txt b/docs/specs/MESA_framebuffer_flip_y.txt
index 697ab4e75d655affa9b4eec4bd677b773967e771..69eca342cba05cb4c3345ab88424e38a64bebacb 100644 (file)
--- a/docs/specs/MESA_framebuffer_flip_y.txt
+++ b/docs/specs/MESA_framebuffer_flip_y.txt
@@ -15,6 +15,7 @@ Contributors
     Fritz Koenig, Google
     Kristian Høgsberg, Google
     Chad Versace, Google
+    Heinrich Fink, DAQRI
 
 Status
 
@@ -22,7 +23,7 @@ Status
 
 Version
 
-    Version 1, June 7, 2018
+    Version 2, June 4, 2019
 
 Number
 
@@ -30,7 +31,7 @@ Number
 
 Dependencies
 
-    OpenGL ES 3.1 is required, for FramebufferParameteri.
+    OpenGL ES 3.1 or OpenGL 4.3 is required, for FramebufferParameteri.
 
 Overview
 
@@ -77,5 +78,8 @@ Errors
 
 Revision History
 
+    Version 2, June, 2019
+        Added OpenGL 4.3 as alternative requirement
+
     Version 1, June, 2018
         Initial draft (Fritz Koenig)

diff --git a/src/mapi/glapi/registry/gl.xml b/src/mapi/glapi/registry/gl.xml
index d3f40527748d4c5fab9aa6aad422460c99bcd9b4..9cc9d822f7092cbc4d3a803e6a98a2e58652072c 100644 (file)
--- a/src/mapi/glapi/registry/gl.xml
+++ b/src/mapi/glapi/registry/gl.xml
@@ -46225,7 +46225,7 @@ typedef unsigned int GLhandleARB;
                 <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>

diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 02f36887bca44134705f00d04d3bef1c4d063ddf..b3d2d072a23c80a113e8a1e5a89154f2ee2f2012 100644 (file)
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -352,7 +352,7 @@ EXT(KHR_texture_compression_astc_hdr        , KHR_texture_compression_astc_hdr
 EXT(KHR_texture_compression_astc_ldr        , KHR_texture_compression_astc_ldr       , GLL, GLC,  x , ES2, 2012)
 EXT(KHR_texture_compression_astc_sliced_3d  , KHR_texture_compression_astc_sliced_3d , GLL, GLC,  x , ES2, 2015)
 
-EXT(MESA_framebuffer_flip_y                 , MESA_framebuffer_flip_y                ,   x,   x,  x ,  31, 2018)
+EXT(MESA_framebuffer_flip_y                 , MESA_framebuffer_flip_y                ,  43,  43,  x ,  31, 2018)
 EXT(MESA_pack_invert                        , MESA_pack_invert                       , GLL, GLC,  x ,  x , 2002)
 EXT(MESA_shader_integer_functions           , MESA_shader_integer_functions          , GLL, GLC,  x ,  30, 2016)
 EXT(MESA_texture_signed_rgba                , EXT_texture_snorm                      , GLL, GLC,  x ,  x , 2009)