X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshader.cpp;h=1b3455f1aa91270c810d0494ac80c3e80b7fe051;hb=661073576254a203fa497fb4c2f550dc269cd5de;hp=0da1a6e9df448028cc9518e23c12207dbf751723;hpb=9733137499a84f44c29d06d2551d41a903de1112;p=libs%2Fgl.git

diff --git a/source/shader.cpp b/source/shader.cpp
index 0da1a6e9..1b3455f1 100644
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,7 +1,8 @@
-#include "arb_fragment_shader.h"
-#include "arb_shader_objects.h"
-#include "arb_vertex_shader.h"
+#include <msp/gl/extensions/arb_fragment_shader.h>
+#include <msp/gl/extensions/arb_shader_objects.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
 #include "error.h"
+#include "misc.h"
 #include "shader.h"
 
 using namespace std;
@@ -57,16 +58,14 @@ void Shader::source(const char *str, int len)
 void Shader::compile()
 {
 	glCompileShader(id);
-	int value = 0;
-	glGetShaderiv(id, GL_COMPILE_STATUS, &value);
-	if(!(compiled = value))
+	compiled = get_shader_i(id, GL_COMPILE_STATUS);
+	if(!compiled)
 		throw compile_error(get_info_log());
 }
 
 string Shader::get_info_log() const
 {
-	GLsizei len = 0;
-	glGetShaderiv(id, GL_INFO_LOG_LENGTH, &len);
+	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);