X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshader.cpp;h=02dcc0dcff789fe142f9b47d4bde5ad2e48fe7fa;hb=61c8b6e824977ce025c979005b141ff4bb02b0e9;hp=17bf3fad3196ad08b735669bda32f72bf2212a92;hpb=e3561c5c4d0b2caf00a0e50ce85c11a9fb62aa72;p=libs%2Fgl.git

diff --git a/source/shader.cpp b/source/shader.cpp
index 17bf3fad..02dcc0dc 100644
--- 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"
@@ -26,6 +27,7 @@ Shader::Shader(GLenum t, const string &src)
 
 void Shader::init(GLenum t)
 {
+	static Require _req_base(ARB_shader_objects);
 	compiled = false;
 
 	if(t==GL_FRAGMENT_SHADER)
@@ -33,7 +35,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,15 +66,20 @@ 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
 {
 	GLsizei len = get_shader_i(id, GL_INFO_LOG_LENGTH);
-	char *buf = new char[len+1];
-	glGetShaderInfoLog(id, len+1, &len, buf);
-	string log(buf, len);
-	delete[] buf;
+	string log(len+1, 0);
+	glGetShaderInfoLog(id, len+1, &len, &log[0]);
+	log.erase(len);
 	return log;
 }