mspdatafile APIs have changed slightly

[libs/gl.git] / source / shader.cpp

diff --git a/source/shader.cpp b/source/shader.cpp
index 5ff2eb3609bd33a6fe1b30ae00eecd145f209a1f..0f60edcd6195324db4201dac50feda4fa98b6489 100644 (file)
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,12 +1,5 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "arb_shader_objects.h"
-#include "except.h"
+#include "error.h"
 #include "extension.h"
 #include "shader.h"
 
@@ -63,20 +56,16 @@ void Shader::source(const char *str, int len)
 void Shader::compile()
 {
        glCompileShaderARB(id);
-       if(!(compiled = get_param(GL_COMPILE_STATUS)))
-               throw CompileError(get_info_log());
-}
-
-int Shader::get_param(GLenum param) const
-{
-       int value;
-       glGetObjectParameterivARB(id, param, &value);
-       return value;
+       int value = 0;
+       glGetObjectParameterivARB(id, GL_OBJECT_COMPILE_STATUS_ARB, &value);
+       if(!(compiled = value))
+               throw compile_error(get_info_log());
 }
 
 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);