Drop Id tags and copyright notices from files

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

diff --git a/source/shader.cpp b/source/shader.cpp
index 93edafb45b35dab4dac34745cd404d51c1ad12e5..967ac8a624dc63f92248dc7f604b99c44fe73c79 100644 (file)
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,10 +1,3 @@
-/* $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 "extension.h"
@@ -30,14 +23,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_program");
+               static RequireExtension _ext("GL_ARB_fragment_shader");
        else if(t==VERTEX_SHADER)
-               static RequireExtension _ext("GL_ARB_vertex_program");
+               static RequireExtension _ext("GL_ARB_vertex_shader");
 
-       id=glCreateShaderObjectARB(t);
+       id = glCreateShaderObjectARB(t);
 }
 
 Shader::~Shader()
@@ -45,7 +38,7 @@ Shader::~Shader()
        glDeleteObjectARB(id);
 }
 
-void Shader::source(sizei count, const char **str, const int *len)
+void Shader::source(unsigned count, const char **str, const int *len)
 {
        glShaderSourceARB(id, count, str, len);
 }
@@ -63,22 +56,18 @@ 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
 {
-       sizei 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, reinterpret_cast<GLsizei *>(&len), log);
+       glGetInfoLogARB(id, len+1, &len, log);
        return string(log, len);
 }