-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#define GL_GLEXT_PROTOTYPES
+#include <msp/gl/extensions/arb_fragment_shader.h>
+#include <msp/gl/extensions/arb_shader_objects.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
+#include "error.h"
+#include "misc.h"
#include "shader.h"
using namespace std;
namespace Msp {
namespace GL {
-Shader::Shader(ShaderType t)
+Shader::Shader(GLenum t)
+{
+ init(t);
+}
+
+Shader::Shader(GLenum t, const string &src)
{
- id=glCreateShader(t);
+ init(t);
+
+ source(src);
+ compile();
+}
+
+void Shader::init(GLenum t)
+{
+ compiled = false;
+
+ if(t==GL_FRAGMENT_SHADER)
+ static Require _req(ARB_fragment_shader);
+ else if(t==GL_VERTEX_SHADER)
+ static Require _req(ARB_vertex_shader);
+
+ id = glCreateShader(t);
}
Shader::~Shader()
glDeleteShader(id);
}
-void Shader::source(sizei count, const char **str, const int *len)
+void Shader::source(unsigned count, const char **str, const int *len)
{
glShaderSource(id, count, str, len);
}
source(1, &str, &len);
}
-bool Shader::compile()
+void Shader::compile()
{
glCompileShader(id);
- compiled=get_param(GL_COMPILE_STATUS);
- return compiled;
-}
-
-int Shader::get_param(GLenum param) const
-{
- int value;
- glGetShaderiv(id, param, &value);
- return value;
+ compiled = get_shader_i(id, GL_COMPILE_STATUS);
+ if(!compiled)
+ throw compile_error(get_info_log());
}
string Shader::get_info_log() const
{
- sizei len=get_param(GL_INFO_LOG_LENGTH);
- char log[len+1];
- glGetShaderInfoLog(id, len+1, reinterpret_cast<GLsizei *>(&len), log);
- return string(log, len);
+ GLsizei len = get_shader_i(id, GL_INFO_LOG_LENGTH);
+ char *buf = new char[len+1];
+ glGetShaderInfoLog(id, len+1, &len, buf);
+ string log(buf, len);
+ delete[] buf;
+ return log;
}
+
+VertexShader::VertexShader():
+ Shader(GL_VERTEX_SHADER)
+{ }
+
+VertexShader::VertexShader(const string &src):
+ Shader(GL_VERTEX_SHADER, src)
+{ }
+
+
+FragmentShader::FragmentShader():
+ Shader(GL_FRAGMENT_SHADER)
+{ }
+
+FragmentShader::FragmentShader(const string &src):
+ Shader(GL_FRAGMENT_SHADER, src)
+{ }
+
} // namespace GL
} // namespace Msp