X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshader.cpp;h=02dcc0dcff789fe142f9b47d4bde5ad2e48fe7fa;hb=5bc9c7214feaf4ea4797fc0d4a906e5e59b75839;hp=b620641e5af789bc2c3cc5fe87edcc1799f61249;hpb=e9374cde7e471b0150140b37e5bd7cd5a0d720d9;p=libs%2Fgl.git

diff --git a/source/shader.cpp b/source/shader.cpp
index b620641e..02dcc0dc 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"
@@ -27,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)
@@ -34,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);
 }
@@ -76,10 +77,9 @@ void Shader::compile()
 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;
 }