More flexible system for customizing generated shaders

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

diff --git a/source/program.cpp b/source/program.cpp
index ffdd3b6380e03180a6e3790ea730d57fcd6d8832..baeba9f5c33d1091da815f0d14d7f6be45807b3b 100644 (file)
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -5,9 +5,11 @@
 #include <msp/gl/extensions/arb_shader_objects.h>
 #include <msp/gl/extensions/arb_uniform_buffer_object.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
+#include <msp/gl/extensions/ext_gpu_shader4.h>
 #include <msp/strings/format.h>
 #include "buffer.h"
 #include "error.h"
+#include "misc.h"
 #include "program.h"
 #include "shader.h"
 
@@ -27,8 +29,7 @@ Program::Program(const ProgramBuilder::StandardFeatures &features)
 
        ProgramBuilder builder(features);
        builder.add_shaders(*this);
-       if(!features.transform)
-               link();
+       link();
 }
 
 Program::Program(const string &vert, const string &frag)
@@ -87,6 +88,17 @@ void Program::bind_attribute(unsigned index, const string &name)
        glBindAttribLocation(id, index, name.c_str());
 }
 
+void Program::bind_attribute(VertexComponent comp, const string &name)
+{
+       bind_attribute(get_component_type(comp), name);
+}
+
+void Program::bind_fragment_data(unsigned index, const string &name)
+{
+       static Require _req(EXT_gpu_shader4);
+       glBindFragDataLocation(id, index, name.c_str());
+}
+
 void Program::link()
 {
        for(ShaderList::iterator i=shaders.begin(); i!=shaders.end(); ++i)
@@ -97,15 +109,13 @@ void Program::link()
        legacy_vars = false;
 
        glLinkProgram(id);
-       int value;
-       glGetProgramiv(id, GL_LINK_STATUS, &value);
-       if(!(linked = value))
+       linked = get_program_i(id, GL_LINK_STATUS);
+       if(!linked)
                throw compile_error(get_info_log());
 
-       int count;
-       glGetProgramiv(id, GL_ACTIVE_UNIFORMS, &count);
+       unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS);
        vector<UniformInfo *> uniforms_by_index(count);
-       for(int i=0; i<count; ++i)
+       for(unsigned i=0; i<count; ++i)
        {
                char name[128];
                int len = 0;
@@ -132,8 +142,8 @@ void Program::link()
                        legacy_vars = true;
        }
 
-       glGetProgramiv(id, GL_ACTIVE_ATTRIBUTES, &count);
-       for(int i=0; i<count; ++i)
+       count = get_program_i(id, GL_ACTIVE_ATTRIBUTES);
+       for(unsigned i=0; i<count; ++i)
        {
                char name[128];
                int len = 0;
@@ -146,8 +156,8 @@ void Program::link()
 
        if(ARB_uniform_buffer_object)
        {
-               glGetProgramiv(id, GL_ACTIVE_UNIFORM_BLOCKS, &count);
-               for(int i=0; i<count; ++i)
+               count = get_program_i(id, GL_ACTIVE_UNIFORM_BLOCKS);
+               for(unsigned i=0; i<count; ++i)
                {
                        char name[128];
                        int len;
@@ -155,6 +165,7 @@ void Program::link()
                        UniformBlockInfo &info = uniform_blocks[name];
                        info.name = name;
 
+                       int value;
                        glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_DATA_SIZE, &value);
                        info.data_size = value;
 
@@ -235,8 +246,7 @@ bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInf
 
 string Program::get_info_log() const
 {
-       GLsizei len = 0;
-       glGetProgramiv(id, GL_INFO_LOG_LENGTH, &len);
+       GLsizei len = get_program_i(id, GL_INFO_LOG_LENGTH);
        char *buf = new char[len+1];
        glGetProgramInfoLog(id, len+1, &len, buf);
        string log(buf, len);