X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Fprogram.cpp;h=c8ce67a8897fc6fd5499b251e4a7713b71ff496e;hb=6924ea10c4111b11eab51f0e1aa5b4a6438da7d3;hp=ffdd3b6380e03180a6e3790ea730d57fcd6d8832;hpb=f136af6873d7409daffe262b14f632af986bd7dc;p=libs%2Fgl.git

diff --git a/source/program.cpp b/source/program.cpp
index ffdd3b63..c8ce67a8 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -8,6 +8,7 @@
 #include <msp/strings/format.h>
 #include "buffer.h"
 #include "error.h"
+#include "misc.h"
 #include "program.h"
 #include "shader.h"
 
@@ -97,15 +98,13 @@ void Program::link()
 	legacy_vars = false;
 
 	glLinkProgram(id);
-	int value;
-	glGetProgramiv(id, GL_LINK_STATUS, &value);
-	if(!(linked = value))
+	linked = get_program_i(id, GL_LINK_STATUS);
+	if(!linked)
 		throw compile_error(get_info_log());
 
-	int count;
-	glGetProgramiv(id, GL_ACTIVE_UNIFORMS, &count);
+	unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS);
 	vector<UniformInfo *> uniforms_by_index(count);
-	for(int i=0; i<count; ++i)
+	for(unsigned i=0; i<count; ++i)
 	{
 		char name[128];
 		int len = 0;
@@ -132,8 +131,8 @@ void Program::link()
 			legacy_vars = true;
 	}
 
-	glGetProgramiv(id, GL_ACTIVE_ATTRIBUTES, &count);
-	for(int i=0; i<count; ++i)
+	count = get_program_i(id, GL_ACTIVE_ATTRIBUTES);
+	for(unsigned i=0; i<count; ++i)
 	{
 		char name[128];
 		int len = 0;
@@ -146,8 +145,8 @@ void Program::link()
 
 	if(ARB_uniform_buffer_object)
 	{
-		glGetProgramiv(id, GL_ACTIVE_UNIFORM_BLOCKS, &count);
-		for(int i=0; i<count; ++i)
+		count = get_program_i(id, GL_ACTIVE_UNIFORM_BLOCKS);
+		for(unsigned i=0; i<count; ++i)
 		{
 			char name[128];
 			int len;
@@ -155,6 +154,7 @@ void Program::link()
 			UniformBlockInfo &info = uniform_blocks[name];
 			info.name = name;
 
+			int value;
 			glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_DATA_SIZE, &value);
 			info.data_size = value;
 
@@ -235,8 +235,7 @@ bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInf
 
 string Program::get_info_log() const
 {
-	GLsizei len = 0;
-	glGetProgramiv(id, GL_INFO_LOG_LENGTH, &len);
+	GLsizei len = get_program_i(id, GL_INFO_LOG_LENGTH);
 	char *buf = new char[len+1];
 	glGetProgramInfoLog(id, len+1, &len, buf);
 	string log(buf, len);