X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.cpp;h=ffdd3b6380e03180a6e3790ea730d57fcd6d8832;hb=798703e937da6b4bbbc4a33f6670ca6fa61e47c3;hp=95102fe9b8367205ec70976f3f77b9b1811d3ea5;hpb=0778636782c7c42564bfea87d56fc76c583a888e;p=libs%2Fgl.git

diff --git a/source/program.cpp b/source/program.cpp
index 95102fe9..ffdd3b63 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"
@@ -94,6 +94,7 @@ void Program::link()
 			(*i)->compile();
 
 	uniforms.clear();
+	legacy_vars = false;
 
 	glLinkProgram(id);
 	int value;
@@ -101,16 +102,16 @@ 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,
@@ -127,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;