Move transform loading to ObjectInstance

[libs/gl.git] / source / shader.cpp

diff --git a/source/shader.cpp b/source/shader.cpp
index 17bf3fad3196ad08b735669bda32f72bf2212a92..0c356f5f460826f7e97877881d15f35ba3db36f0 100644 (file)
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,7 +1,8 @@
 #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"
 #include "shader.h"
@@ -33,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);
 }
@@ -64,6 +65,12 @@ void Shader::compile()
        compiled = get_shader_i(id, GL_COMPILE_STATUS);
        if(!compiled)
                throw compile_error(get_info_log());
+
+#ifdef DEBUG
+       string info_log = get_info_log();
+       if(!info_log.empty())
+               IO::print("Shader compile info log:\n%s", info_log);
+#endif
 }
 
 string Shader::get_info_log() const