Be more direct about getting uniform counts from the program object

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

diff --git a/source/program.cpp b/source/program.cpp
index 1735d5fa6e328afd2f3141f7783b3544d74bb083..8b7bc6c726f49ee1fdce4f130a9e6aaa373af25e 100644 (file)
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -2,10 +2,10 @@
 #include <cstring>
 #include <msp/core/hash.h>
 #include <msp/core/maputils.h>
+#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/strings/format.h>
-#include "arb_shader_objects.h"
-#include "arb_uniform_buffer_object.h"
-#include "arb_vertex_shader.h"
 #include "buffer.h"
 #include "error.h"
 #include "program.h"
@@ -101,10 +101,10 @@ void Program::link()
        if(!(linked = value))
                throw compile_error(get_info_log());
 
-       glGetProgramiv(id, GL_ACTIVE_UNIFORMS, &value);
-       unsigned count = value;
+       int count;
+       glGetProgramiv(id, GL_ACTIVE_UNIFORMS, &count);
        vector<UniformInfo *> uniforms_by_index(count);
-       for(unsigned i=0; i<count; ++i)
+       for(int i=0; i<count; ++i)
        {
                char name[128];
                int len = 0;
@@ -113,6 +113,11 @@ void Program::link()
                glGetActiveUniform(id, i, 128, &len, &size, &type, name);
                if(len && strncmp(name, "gl_", 3))
                {
+                       /* Some implementations report the first element of a uniform array,
+                       others report just the name of an array. */
+                       if(len>3 && !strcmp(name+len-3, "[0]"))
+                               name[len-3] = 0;
+
                        UniformInfo &info = uniforms[name];
                        info.block = 0;
                        info.name = name;
@@ -126,9 +131,8 @@ void Program::link()
 
        if(ARB_uniform_buffer_object)
        {
-               glGetProgramiv(id, GL_ACTIVE_UNIFORM_BLOCKS, &value);
-               count = value;
-               for(unsigned i=0; i<count; ++i)
+               glGetProgramiv(id, GL_ACTIVE_UNIFORM_BLOCKS, &count);
+               for(int i=0; i<count; ++i)
                {
                        char name[128];
                        int len;
@@ -192,19 +196,12 @@ void Program::link()
 
        vector<const UniformInfo *> blockless_uniforms;
        for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-       {
                if(!i->second.block)
                {
                        i->second.location = glGetUniformLocation(id, i->second.name.c_str());
                        blockless_uniforms.push_back(&i->second);
                }
 
-               /* Some implementations report the first element of a uniform array,
-               others report just the name of an array. */
-               if(i->second.name.size()>3 && !i->second.name.compare(i->second.name.size()-3, 3, "[0]"))
-                       i->second.name.erase(i->second.name.size()-3, 3);
-       }
-
        uniform_layout_hash = compute_layout_hash(blockless_uniforms);
 }