X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.cpp;h=77fe7e7510d9e09597712803ade770267486b26e;hb=953f041e904e97c4435e0229b8d88eabe31e5c3d;hp=eb9481f2426ae7908f2a875aa9efa07ab7caed3e;hpb=8ac93980ef87834fd431c97104baa441561a7ce0;p=libs%2Fgl.git

diff --git a/source/program.cpp b/source/program.cpp
index eb9481f2..77fe7e75 100644
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -212,24 +212,20 @@ void Program::bind_attribute(unsigned index, const string &name)
 void Program::link()
 {
 	for(list<Shader *>::iterator i=shaders.begin(); i!=shaders.end(); ++i)
-		if(!(*i)->get_compiled())
+		if(!(*i)->is_compiled())
 			(*i)->compile();
 
 	glLinkProgramARB(id);
-	if(!(linked = get_param(GL_LINK_STATUS)))
-		throw CompileError(get_info_log());
-}
-
-int Program::get_param(GLenum param) const
-{
 	int value;
-	glGetObjectParameterivARB(id, param, &value);
-	return value;
+	glGetObjectParameterivARB(id, GL_OBJECT_LINK_STATUS_ARB, &value);
+	if(!(linked = value))
+		throw CompileError(get_info_log());
 }
 
 string Program::get_info_log() const
 {
-	GLsizei len = get_param(GL_INFO_LOG_LENGTH);
+	GLsizei len = 0;
+	glGetObjectParameterivARB(id, GL_OBJECT_INFO_LOG_LENGTH_ARB, &len);
 	char log[len+1];
 	glGetInfoLogARB(id, len+1, &len, log);
 	return string(log, len);