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

diff --git a/source/shader.cpp b/source/shader.cpp
index ac604630..3c012426 100644
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -5,7 +5,9 @@ Copyright © 2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#define GL_GLEXT_PROTOTYPES
+#include "arb_shader_objects.h"
+#include "except.h"
+#include "extension.h"
 #include "shader.h"
 
 using namespace std;
@@ -13,19 +15,39 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Shader::Shader(ShaderType t)
+Shader::Shader(ShaderType t):
+	compiled(false)
 {
-	id=glCreateShader(t);
+	if(t==FRAGMENT_SHADER)
+		require_extension("GL_ARB_fragment_program");
+	else if(t==VERTEX_SHADER)
+		require_extension("GL_ARB_vertex_program");
+
+	id=glCreateShaderObjectARB(t);
+}
+
+Shader::Shader(ShaderType t, const string &src):
+	compiled(false)
+{
+	if(t==FRAGMENT_SHADER)
+		require_extension("GL_ARB_fragment_program");
+	else if(t==VERTEX_SHADER)
+		require_extension("GL_ARB_vertex_program");
+
+	id=glCreateShaderObjectARB(t);
+
+	source(src);
+	compile();
 }
 
 Shader::~Shader()
 {
-	glDeleteShader(id);
+	glDeleteObjectARB(id);
 }
 
 void Shader::source(sizei count, const char **str, const int *len)
 {
-	glShaderSource(id, count, str, len);
+	glShaderSourceARB(id, count, str, len);
 }
 
 void Shader::source(const string &str)
@@ -38,17 +60,17 @@ void Shader::source(const char *str, int len)
 	source(1, &str, &len);
 }
 
-bool Shader::compile()
+void Shader::compile()
 {
-	glCompileShader(id);
-	compiled=get_param(GL_COMPILE_STATUS);
-	return compiled;
+	glCompileShaderARB(id);
+	if(!(compiled=get_param(GL_COMPILE_STATUS)))
+		throw CompileError(get_info_log());
 }
 
 int Shader::get_param(GLenum param) const
 {
 	int value;
-	glGetShaderiv(id, param, &value);
+	glGetObjectParameterivARB(id, param, &value);
 	return value;
 }
 
@@ -56,7 +78,7 @@ string Shader::get_info_log() const
 {
 	sizei len=get_param(GL_INFO_LOG_LENGTH);
 	char log[len+1];
-	glGetShaderInfoLog(id, len+1, reinterpret_cast<GLsizei *>(&len), log);
+	glGetInfoLogARB(id, len+1, reinterpret_cast<GLsizei *>(&len), log);
 	return string(log, len);
 }