X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshader.cpp;h=cdb50c969d59edaf2dfc7edc044579192632eed7;hb=48fc090a59a5ff5c3f06ffe1acfe77b06dad2a86;hp=3c01242650d3bd26009a0a57711e34dc4a0779f7;hpb=85e83ace47e5a9a8ae7263886255dd81afc69278;p=libs%2Fgl.git

diff --git a/source/shader.cpp b/source/shader.cpp
index 3c012426..cdb50c96 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"
 
@@ -15,29 +8,29 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Shader::Shader(ShaderType t):
-	compiled(false)
+Shader::Shader(ShaderType t)
 {
-	if(t==FRAGMENT_SHADER)
-		require_extension("GL_ARB_fragment_program");
-	else if(t==VERTEX_SHADER)
-		require_extension("GL_ARB_vertex_program");
+	init(t);
+}
+
+Shader::Shader(ShaderType t, const string &src)
+{
+	init(t);
 
-	id=glCreateShaderObjectARB(t);
+	source(src);
+	compile();
 }
 
-Shader::Shader(ShaderType t, const string &src):
-	compiled(false)
+void Shader::init(ShaderType t)
 {
+	compiled = false;
+
 	if(t==FRAGMENT_SHADER)
-		require_extension("GL_ARB_fragment_program");
+		static RequireExtension _ext("GL_ARB_fragment_shader");
 	else if(t==VERTEX_SHADER)
-		require_extension("GL_ARB_vertex_program");
+		static RequireExtension _ext("GL_ARB_vertex_shader");
 
-	id=glCreateShaderObjectARB(t);
-
-	source(src);
-	compile();
+	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,23 +56,21 @@ 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);
-	char log[len+1];
-	glGetInfoLogARB(id, len+1, reinterpret_cast<GLsizei *>(&len), log);
-	return string(log, len);
+	GLsizei len = 0;
+	glGetObjectParameterivARB(id, GL_OBJECT_INFO_LOG_LENGTH_ARB, &len);
+	char *buf = new char[len+1];
+	glGetInfoLogARB(id, len+1, &len, buf);
+	string log(buf, len);
+	delete[] buf;
+	return log;
 }
 
 } // namespace GL