Complete rewrite of extension handling

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

diff --git a/source/program.cpp b/source/program.cpp
index 8892bcf1ed7861b632c7c0bc5089ed53e61b4756..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,21 +246,23 @@ 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];
                        info.block = 0;
                        info.name = name;
                        info.size = size;
+                       info.array_stride = 0;
+                       info.matrix_stride = 0;
                        info.type = type;
                        uniforms_by_index[i] = &info;
                }
        }
 
-       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)
                {
@@ -295,9 +296,12 @@ void Program::link()
                        for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
                                if(uniforms_by_index[*j]->size>1)
                                        indices2.push_back(*j);
-                       glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_ARRAY_STRIDE, &values[0]);
-                       for(unsigned j=0; j<indices2.size(); ++j)
-                               uniforms_by_index[indices[j]]->array_stride = values[j];
+                       if(!indices2.empty())
+                       {
+                               glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_ARRAY_STRIDE, &values[0]);
+                               for(unsigned j=0; j<indices2.size(); ++j)
+                                       uniforms_by_index[indices[j]]->array_stride = values[j];
+                       }
 
                        indices2.clear();
                        for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
@@ -308,10 +312,14 @@ void Program::link()
                                        t==GL_FLOAT_MAT3x4 || t==GL_FLOAT_MAT4x2 || t==GL_FLOAT_MAT4x3)
                                        indices2.push_back(*j);
                        }
-                       glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_MATRIX_STRIDE, &values[0]);
-                       for(unsigned j=0; j<indices2.size(); ++j)
-                               uniforms_by_index[indices[j]]->matrix_stride = values[j];
+                       if(!indices2.empty())
+                       {
+                               glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_MATRIX_STRIDE, &values[0]);
+                               for(unsigned j=0; j<indices2.size(); ++j)
+                                       uniforms_by_index[indices[j]]->matrix_stride = values[j];
+                       }
 
+                       sort(info.uniforms.begin(), info.uniforms.end(), uniform_location_compare);
                        info.layout_hash = compute_layout_hash(info.uniforms);
                        info.bind_point = info.layout_hash%BufferRange::get_n_uniform_buffer_bindings();
                        glUniformBlockBinding(id, i, info.bind_point);
@@ -322,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);
                }
 
@@ -337,12 +345,17 @@ unsigned Program::compute_layout_hash(const vector<const UniformInfo *> &uniform
        return hash32(layout_descriptor);
 }
 
+bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInfo *uni2)
+{
+       return uni1->location<uni2->location;
+}
+
 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;
@@ -373,14 +386,14 @@ int Program::get_uniform_location(const string &n) const
                                add an offset. */
                                unsigned offset = lexical_cast<unsigned>(n.substr(open_bracket+1, n.size()-2-open_bracket));
                                i = uniforms.find(n.substr(0, open_bracket)+"[0]");
-                               if(i!=uniforms.end() && offset<i->second.size)
+                               if(i!=uniforms.end() && !i->second.block && offset<i->second.size)
                                        return i->second.location+offset;
                        }
                }
                return -1;
        }
 
-       return i->second.location;
+       return i->second.block ? -1 : i->second.location;
 }
 
 void Program::bind() const
@@ -391,7 +404,7 @@ void Program::bind() const
        if(!set_current(this))
                return;
 
-       glUseProgramObjectARB(id);
+       glUseProgram(id);
 }
 
 void Program::unbind()
@@ -399,7 +412,7 @@ void Program::unbind()
        if(!set_current(0))
                return;
 
-       glUseProgramObjectARB(0);
+       glUseProgram(0);
 }