X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshader.cpp;h=0f60edcd6195324db4201dac50feda4fa98b6489;hb=2e7f19b895424c3a77940e648639f8df2b395d0f;hp=85451527c28bf8593aa64d8527555eff9aac7647;hpb=b8fef9be469eb16e54068bac7e275ea225efc71c;p=libs%2Fgl.git

diff --git a/source/shader.cpp b/source/shader.cpp
index 85451527..0f60edcd 100644
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "arb_shader_objects.h"
-#include "except.h"
+#include "error.h"
 #include "extension.h"
 #include "shader.h"
 
@@ -30,14 +23,14 @@ Shader::Shader(ShaderType t, const string &src)
 
 void Shader::init(ShaderType t)
 {
-	compiled=false;
+	compiled = false;
 
 	if(t==FRAGMENT_SHADER)
 		static RequireExtension _ext("GL_ARB_fragment_shader");
 	else if(t==VERTEX_SHADER)
 		static RequireExtension _ext("GL_ARB_vertex_shader");
 
-	id=glCreateShaderObjectARB(t);
+	id = glCreateShaderObjectARB(t);
 }
 
 Shader::~Shader()
@@ -45,7 +38,7 @@ Shader::~Shader()
 	glDeleteObjectARB(id);
 }
 
-void Shader::source(sizei count, const char **str, const int *len)
+void Shader::source(unsigned count, const char **str, const int *len)
 {
 	glShaderSourceARB(id, count, str, len);
 }
@@ -63,22 +56,18 @@ void Shader::source(const char *str, int len)
 void Shader::compile()
 {
 	glCompileShaderARB(id);
-	if(!(compiled=get_param(GL_COMPILE_STATUS)))
-		throw CompileError(get_info_log());
-}
-
-int Shader::get_param(GLenum param) const
-{
-	int value;
-	glGetObjectParameterivARB(id, param, &value);
-	return value;
+	int value = 0;
+	glGetObjectParameterivARB(id, GL_OBJECT_COMPILE_STATUS_ARB, &value);
+	if(!(compiled = value))
+		throw compile_error(get_info_log());
 }
 
 string Shader::get_info_log() const
 {
-	sizei len=get_param(GL_INFO_LOG_LENGTH);
+	GLsizei len = 0;
+	glGetObjectParameterivARB(id, GL_OBJECT_INFO_LOG_LENGTH_ARB, &len);
 	char log[len+1];
-	glGetInfoLogARB(id, len+1, reinterpret_cast<GLsizei *>(&len), log);
+	glGetInfoLogARB(id, len+1, &len, log);
 	return string(log, len);
 }