From daf256f6dd858420233e73bf128abb3ae5801e5b Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 26 Oct 2016 21:42:38 +0300
Subject: [PATCH] Use ARB_geometry_shader4 rather than the EXT version

The ARB version is what actually got promoted.
---
 extensions/arb_geometry_shader4.glext | 2 ++
 extensions/ext_geometry_shader4.glext | 2 --
 gl.fixes.xml                          | 3 +++
 source/shader.cpp                     | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 extensions/arb_geometry_shader4.glext
 delete mode 100644 extensions/ext_geometry_shader4.glext

diff --git a/extensions/arb_geometry_shader4.glext b/extensions/arb_geometry_shader4.glext
new file mode 100644
index 00000000..04cfbb3b
--- /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
index 210b9bdb..00000000
--- 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 8edc3731..954785a6 100644
--- 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 b620641e..0c356f5f 100644
--- 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);
 }
-- 
2.43.0