X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.cpp;h=61610493df811411cc2a82ef980633754b97f36b;hb=619aae12e01f25e79626a94c973927e5599e99a5;hp=1735d5fa6e328afd2f3141f7783b3544d74bb083;hpb=5c883e77411a7eccc58d345b7d53d8709ae39452;p=libs%2Fgl.git

diff --git a/source/program.cpp b/source/program.cpp
index 1735d5fa..61610493 100644
--- 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"
@@ -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;
@@ -192,19 +197,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);
 }