Add support for detecting extensions

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

diff --git a/source/shader.cpp b/source/shader.cpp
index ac604630904a6c8db9632dff8f8e715976f2d0cf..45d56a16070c9fb9f50d892b3b6f17188877f8c5 100644 (file)
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -5,7 +5,8 @@ Copyright © 2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#define GL_GLEXT_PROTOTYPES
+#include "arb_shader_objects.h"
+#include "extension.h"
 #include "shader.h"
 
 using namespace std;
@@ -13,19 +14,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)
@@ -40,7 +61,7 @@ void Shader::source(const char *str, int len)
 
 bool Shader::compile()
 {
-       glCompileShader(id);
+       glCompileShaderARB(id);
        compiled=get_param(GL_COMPILE_STATUS);
        return compiled;
 }
@@ -48,7 +69,7 @@ bool Shader::compile()
 int Shader::get_param(GLenum param) const
 {
        int value;
-       glGetShaderiv(id, param, &value);
+       glGetObjectParameterivARB(id, param, &value);
        return value;
 }
 
@@ -56,7 +77,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);
 }