Convert Matrix to use floats

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

diff --git a/source/program.cpp b/source/program.cpp
index 1735d5fa6e328afd2f3141f7783b3544d74bb083..ffdd3b6380e03180a6e3790ea730d57fcd6d8832 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"
@@ -94,6 +94,7 @@ void Program::link()
                        (*i)->compile();
 
        uniforms.clear();
+       legacy_vars = false;
 
        glLinkProgram(id);
        int value;
@@ -101,18 +102,23 @@ 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;
                int size;
                GLenum type;
-               glGetActiveUniform(id, i, 128, &len, &size, &type, name);
+               glGetActiveUniform(id, i, sizeof(name), &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;
@@ -122,17 +128,30 @@ void Program::link()
                        info.type = type;
                        uniforms_by_index[i] = &info;
                }
+               else
+                       legacy_vars = true;
+       }
+
+       glGetProgramiv(id, GL_ACTIVE_ATTRIBUTES, &count);
+       for(int i=0; i<count; ++i)
+       {
+               char name[128];
+               int len = 0;
+               int size;
+               GLenum type;
+               glGetActiveAttrib(id, i, sizeof(name), &len, &size, &type, name);
+               if(len && !strncmp(name, "gl_", 3))
+                       legacy_vars = true;
        }
 
        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;
-                       glGetActiveUniformBlockName(id, i, 128, &len, name);
+                       glGetActiveUniformBlockName(id, i, sizeof(name), &len, name);
                        UniformBlockInfo &info = uniform_blocks[name];
                        info.name = name;
 
@@ -192,19 +211,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);
 }