Use ARB_geometry_shader4 rather than the EXT version

The ARB version is what actually got promoted.

diff --git a/extensions/arb_geometry_shader4.glext b/extensions/arb_geometry_shader4.glext
new file mode 100644 (file)
index 0000000..04cfbb3
--- /dev/null
+++ b/extensions/arb_geometry_shader4.glext
@@ -0,0 +1,2 @@
+extension ARB_geometry_shader4
+backport none

diff --git a/extensions/ext_geometry_shader4.glext b/extensions/ext_geometry_shader4.glext
deleted file mode 100644 (file)
index 210b9bd..0000000
--- a/extensions/ext_geometry_shader4.glext
+++ /dev/null
@@ -1,2 +0,0 @@
-extension EXT_geometry_shader4
-backport none

diff --git a/gl.fixes.xml b/gl.fixes.xml
index 8edc3731bea7baeb3c4ee77af3859cc3a715136b..954785a6eab5d1a18672eb4017f7eee3c15e9bf7 100644 (file)
--- a/gl.fixes.xml
+++ b/gl.fixes.xml
@@ -77,6 +77,9 @@
             <!-- Ignore this, as it comes from ARB_vertex_program and I'm not
             sure if it works with ARB_shader_objects. -->
             <command name="glIsProgramARB" />
+
+            <!-- This was never promoted from ARB_geometry_shader4. -->
+            <command name="glFramebufferTextureFaceARB" />
         </remove>
     </feature>
 

diff --git a/source/shader.cpp b/source/shader.cpp
index b620641e5af789bc2c3cc5fe87edcc1799f61249..0c356f5f460826f7e97877881d15f35ba3db36f0 100644 (file)
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,7 +1,7 @@
 #include <msp/gl/extensions/arb_fragment_shader.h>
+#include <msp/gl/extensions/arb_geometry_shader4.h>
 #include <msp/gl/extensions/arb_shader_objects.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
-#include <msp/gl/extensions/ext_geometry_shader4.h>
 #include <msp/io/print.h>
 #include "error.h"
 #include "misc.h"
@@ -34,7 +34,7 @@ void Shader::init(GLenum t)
        else if(t==GL_VERTEX_SHADER)
                static Require _req(ARB_vertex_shader);
        else if(t==GL_GEOMETRY_SHADER)
-               static Require _req(EXT_geometry_shader4);
+               static Require _req(ARB_geometry_shader4);
 
        id = glCreateShader(t);
 }