X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshader.cpp;h=1b3455f1aa91270c810d0494ac80c3e80b7fe051;hb=a480d4cc323db7cc77388f5af0094dd593dc66e9;hp=61c2f0e56b0e7125bed8df5f0d9dad32c6ce736e;hpb=3f285d3f4fd0a6790bf1efa780284dc7ba2287a2;p=libs%2Fgl.git

diff --git a/source/shader.cpp b/source/shader.cpp
index 61c2f0e5..1b3455f1 100644
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,11 +1,8 @@
-/* $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;
@@ -13,25 +10,37 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Shader::Shader(ShaderType t):
-	id(glCreateShader(t)),
-	compiled(false)
-{ }
+Shader::Shader(GLenum t)
+{
+	init(t);
+}
 
-Shader::Shader(ShaderType t, const string &src):
-	id(glCreateShader(t)),
-	compiled(false)
+Shader::Shader(GLenum t, const string &src)
 {
+	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);
 }
@@ -46,27 +55,41 @@ void Shader::source(const char *str, int 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