X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshader.cpp;h=b0cf5a3ec63d3f6ed93c4727b955f5a187232ad3;hb=6afbace895a7bbcf216ab8e48280ea0303ab5892;hp=5ff2eb3609bd33a6fe1b30ae00eecd145f209a1f;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/shader.cpp b/source/shader.cpp
index 5ff2eb36..b0cf5a3e 100644
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,13 +1,7 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include "arb_fragment_shader.h"
 #include "arb_shader_objects.h"
-#include "except.h"
-#include "extension.h"
+#include "arb_vertex_shader.h"
+#include "error.h"
 #include "shader.h"
 
 using namespace std;
@@ -33,21 +27,21 @@ void Shader::init(ShaderType t)
 	compiled = false;
 
 	if(t==FRAGMENT_SHADER)
-		static RequireExtension _ext("GL_ARB_fragment_shader");
+		static Require _req(ARB_fragment_shader);
 	else if(t==VERTEX_SHADER)
-		static RequireExtension _ext("GL_ARB_vertex_shader");
+		static Require _req(ARB_vertex_shader);
 
-	id = glCreateShaderObjectARB(t);
+	id = glCreateShader(t);
 }
 
 Shader::~Shader()
 {
-	glDeleteObjectARB(id);
+	glDeleteShader(id);
 }
 
 void Shader::source(unsigned count, const char **str, const int *len)
 {
-	glShaderSourceARB(id, count, str, len);
+	glShaderSource(id, count, str, len);
 }
 
 void Shader::source(const string &str)
@@ -62,24 +56,22 @@ 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;
+	glCompileShader(id);
+	int value = 0;
+	glGetShaderiv(id, GL_COMPILE_STATUS, &value);
+	if(!(compiled = value))
+		throw compile_error(get_info_log());
 }
 
 string Shader::get_info_log() const
 {
-	GLsizei len = get_param(GL_INFO_LOG_LENGTH);
-	char log[len+1];
-	glGetInfoLogARB(id, len+1, &len, log);
-	return string(log, len);
+	GLsizei len = 0;
+	glGetShaderiv(id, GL_INFO_LOG_LENGTH, &len);
+	char *buf = new char[len+1];
+	glGetShaderInfoLog(id, len+1, &len, buf);
+	string log(buf, len);
+	delete[] buf;
+	return log;
 }
 
 } // namespace GL