Use ARB_direct_state_access to avoid some bind calls

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

diff --git a/source/program.cpp b/source/program.cpp
index f56beec73260b58a4eff644aacf4f8d89f4329e0..82308b3405e0c42cc2086925c7633bd6b6a08770 100644 (file)
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -8,6 +8,7 @@
 #include <msp/gl/extensions/arb_vertex_shader.h>
 #include <msp/gl/extensions/ext_gpu_shader4.h>
 #include <msp/gl/extensions/nv_non_square_matrices.h>
+#include <msp/io/print.h>
 #include <msp/strings/format.h>
 #include "buffer.h"
 #include "error.h"
@@ -115,6 +116,12 @@ void Program::link()
        if(!linked)
                throw compile_error(get_info_log());
 
+#ifdef DEBUG
+       std::string info_log = get_info_log();
+       if(!info_log.empty())
+               IO::print("Program link info log:\n%s", info_log);
+#endif
+
        unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS);
        vector<UniformInfo *> uniforms_by_index(count);
        for(unsigned i=0; i<count; ++i)
@@ -284,25 +291,12 @@ const Program::UniformInfo &Program::get_uniform_info(const string &name) const
 
 int Program::get_uniform_location(const string &n) const
 {
+       if(n[n.size()-1]==']')
+               throw invalid_argument("Program::get_uniform_location");
+
        UniformMap::const_iterator i = uniforms.find(n);
        if(i==uniforms.end())
-       {
-               if(n[n.size()-1]==']')
-               {
-                       string::size_type open_bracket = n.rfind('[');
-                       if(open_bracket!=string::npos)
-                       {
-                               /* The requested name looks like an array.  glGetActiveUniform only
-                               gives us the first element of the array, so try to look that up and
-                               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));
-                               if(i!=uniforms.end() && i->second.block->bind_point<0 && offset<i->second.size)
-                                       return i->second.location+offset;
-                       }
-               }
                return -1;
-       }
 
        return i->second.block->bind_point<0 ? i->second.location : -1;
 }
@@ -332,6 +326,7 @@ Program::Loader::Loader(Program &p):
 {
        add("attribute",       &Loader::attribute);
        add("fragment_shader", &Loader::fragment_shader);
+       add("geometry_shader", &Loader::geometry_shader);
        add("standard",        &Loader::standard);
        add("vertex_shader",   &Loader::vertex_shader);
 }
@@ -351,6 +346,11 @@ void Program::Loader::fragment_shader(const string &src)
        obj.attach_shader_owned(new FragmentShader(src));
 }
 
+void Program::Loader::geometry_shader(const string &src)
+{
+       obj.attach_shader_owned(new GeometryShader(src));
+}
+
 void Program::Loader::standard()
 {
        ProgramBuilder::StandardFeatures feat;