Complete rewrite of extension handling

[libs/gl.git] / source / shader.cpp

diff --git a/source/shader.cpp b/source/shader.cpp
index 85451527c28bf8593aa64d8527555eff9aac7647..b0cf5a3ec63d3f6ed93c4727b955f5a187232ad3 100644 (file)
--- 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;
@@ -30,24 +24,24 @@ 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");
+               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(sizei count, const char **str, const int *len)
+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
 {
-       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;
+       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