X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshader.cpp;h=c7a08bfac5e0b71f5371cf841506b21c463e845f;hb=541bf02f18ad27e8c8101e4255586ddbfef40916;hp=e32919bcf7cdd14c41552215fd266795d062bb93;hpb=ceae2a27dfc58310c5bab7e3aa3fedf0fa9a1f49;p=libs%2Fgl.git

diff --git a/source/shader.cpp b/source/shader.cpp
index e32919bc..c7a08bfa 100644
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -30,14 +30,14 @@ Shader::Shader(ShaderType t, const string &src)
 
 void Shader::init(ShaderType t)
 {
-	compiled=false;
+	compiled = false;
 
 	if(t==FRAGMENT_SHADER)
 		static RequireExtension _ext("GL_ARB_fragment_shader");
 	else if(t==VERTEX_SHADER)
 		static RequireExtension _ext("GL_ARB_vertex_shader");
 
-	id=glCreateShaderObjectARB(t);
+	id = glCreateShaderObjectARB(t);
 }
 
 Shader::~Shader()
@@ -63,20 +63,16 @@ void Shader::source(const char *str, int len)
 void Shader::compile()
 {
 	glCompileShaderARB(id);
-	if(!(compiled=get_param(GL_COMPILE_STATUS)))
+	int value = 0;
+	glGetObjectParameterivARB(id, GL_OBJECT_COMPILE_STATUS_ARB, &value);
+	if(!(compiled = value))
 		throw CompileError(get_info_log());
 }
 
-int Shader::get_param(GLenum param) const
-{
-	int value;
-	glGetObjectParameterivARB(id, param, &value);
-	return value;
-}
-
 string Shader::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);