From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 25 Nov 2013 15:24:18 +0000 (+0200)
Subject: Be more direct about getting uniform counts from the program object
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=2524bb81a3a642830b88a4268fedc03d59a93e60;p=libs%2Fgl.git

Be more direct about getting uniform counts from the program object
---

diff --git a/source/program.cpp b/source/program.cpp
index 61610493..8b7bc6c7 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -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;
@@ -131,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;