-/* $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"
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()
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);
}
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
{
- sizei len=get_param(GL_INFO_LOG_LENGTH);
- char log[len+1];
- glGetInfoLogARB(id, len+1, reinterpret_cast<GLsizei *>(&len), log);
- return string(log, len);
+ GLsizei len = 0;
+ glGetObjectParameterivARB(id, GL_OBJECT_INFO_LOG_LENGTH_ARB, &len);
+ char *buf = new char[len+1];
+ glGetInfoLogARB(id, len+1, &len, buf);
+ string log(buf, len);
+ delete[] buf;
+ return log;
}
} // namespace GL