Complete rewrite of extension handling

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

diff --git a/source/program.cpp b/source/program.cpp
index d962751994d38fe1e7fd93550bb51a545eaec9f6..adbb5c4cfd1a4ccf7ffd3fe41dc75646c33a1a6c 100644 (file)
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -8,7 +8,6 @@
 #include "arb_vertex_shader.h"
 #include "buffer.h"
 #include "error.h"
-#include "extension.h"
 #include "program.h"
 #include "shader.h"
 
@@ -133,24 +132,24 @@ Program::Program(const string &vert, const string &frag)
 
 void Program::init()
 {
-       static RequireExtension _ext("GL_ARB_shader_objects");
+       static Require _req(ARB_shader_objects);
 
        linked = false;
-       id = glCreateProgramObjectARB();
+       id = glCreateProgram();
 }
 
 Program::~Program()
 {
        for(ShaderList::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
                delete *i;
-       glDeleteObjectARB(id);
+       glDeleteProgram(id);
 }
 
 void Program::attach_shader(Shader &shader)
 {
        if(find(shaders.begin(), shaders.end(), &shader)==shaders.end())
        {
-               glAttachObjectARB(id, shader.get_id());
+               glAttachShader(id, shader.get_id());
                shaders.push_back(&shader);
        }
 }
@@ -168,7 +167,7 @@ void Program::detach_shader(Shader &shader)
        if(i!=shaders.end())
        {
                shaders.erase(i, shaders.end());
-               glDetachObjectARB(id, shader.get_id());
+               glDetachShader(id, shader.get_id());
        }
 }
 
@@ -220,8 +219,8 @@ string Program::process_standard_source(const char **source, const string &flags
 
 void Program::bind_attribute(unsigned index, const string &name)
 {
-       static RequireExtension _ext("GL_ARB_vertex_shader");
-       glBindAttribLocationARB(id, index, name.c_str());
+       static Require _req(ARB_vertex_shader);
+       glBindAttribLocation(id, index, name.c_str());
 }
 
 void Program::link()
@@ -232,13 +231,13 @@ void Program::link()
 
        uniforms.clear();
 
-       glLinkProgramARB(id);
+       glLinkProgram(id);
        int value;
-       glGetObjectParameterivARB(id, GL_OBJECT_LINK_STATUS_ARB, &value);
+       glGetProgramiv(id, GL_LINK_STATUS, &value);
        if(!(linked = value))
                throw compile_error(get_info_log());
 
-       glGetObjectParameterivARB(id, GL_OBJECT_ACTIVE_UNIFORMS_ARB, &value);
+       glGetProgramiv(id, GL_ACTIVE_UNIFORMS, &value);
        unsigned count = value;
        vector<UniformInfo *> uniforms_by_index(count);
        for(unsigned i=0; i<count; ++i)
@@ -247,7 +246,7 @@ void Program::link()
                int len = 0;
                int size;
                GLenum type;
-               glGetActiveUniformARB(id, i, 128, &len, &size, &type, name);
+               glGetActiveUniform(id, i, 128, &len, &size, &type, name);
                if(len && strncmp(name, "gl_", 3))
                {
                        UniformInfo &info = uniforms[name];
@@ -261,9 +260,9 @@ void Program::link()
                }
        }
 
-       if(is_supported("GL_ARB_uniform_buffer_object"))
+       if(ARB_uniform_buffer_object)
        {
-               glGetObjectParameterivARB(id, GL_ACTIVE_UNIFORM_BLOCKS, &value);
+               glGetProgramiv(id, GL_ACTIVE_UNIFORM_BLOCKS, &value);
                count = value;
                for(unsigned i=0; i<count; ++i)
                {
@@ -331,7 +330,7 @@ void Program::link()
        for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
                if(!i->second.block)
                {
-                       i->second.location = glGetUniformLocationARB(id, i->second.name.c_str());
+                       i->second.location = glGetUniformLocation(id, i->second.name.c_str());
                        blockless_uniforms.push_back(&i->second);
                }
 
@@ -354,9 +353,9 @@ bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInf
 string Program::get_info_log() const
 {
        GLsizei len = 0;
-       glGetObjectParameterivARB(id, GL_OBJECT_INFO_LOG_LENGTH_ARB, &len);
+       glGetProgramiv(id, GL_INFO_LOG_LENGTH, &len);
        char *buf = new char[len+1];
-       glGetInfoLogARB(id, len+1, &len, buf);
+       glGetProgramInfoLog(id, len+1, &len, buf);
        string log(buf, len);
        delete[] buf;
        return log;
@@ -405,7 +404,7 @@ void Program::bind() const
        if(!set_current(this))
                return;
 
-       glUseProgramObjectARB(id);
+       glUseProgram(id);
 }
 
 void Program::unbind()
@@ -413,7 +412,7 @@ void Program::unbind()
        if(!set_current(0))
                return;
 
-       glUseProgramObjectARB(0);
+       glUseProgram(0);
 }