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

diff --git a/source/shader.cpp b/source/shader.cpp
index 61c2f0e5..b0cf5a3e 100644
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,11 +1,7 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#define GL_GLEXT_PROTOTYPES
+#include "arb_fragment_shader.h"
+#include "arb_shader_objects.h"
+#include "arb_vertex_shader.h"
+#include "error.h"
 #include "shader.h"
 
 using namespace std;
@@ -13,25 +9,37 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Shader::Shader(ShaderType t):
-	id(glCreateShader(t)),
-	compiled(false)
-{ }
+Shader::Shader(ShaderType t)
+{
+	init(t);
+}
 
-Shader::Shader(ShaderType t, const string &src):
-	id(glCreateShader(t)),
-	compiled(false)
+Shader::Shader(ShaderType t, const string &src)
 {
+	init(t);
+
 	source(src);
 	compile();
 }
 
+void Shader::init(ShaderType t)
+{
+	compiled = false;
+
+	if(t==FRAGMENT_SHADER)
+		static Require _req(ARB_fragment_shader);
+	else if(t==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,26 +54,24 @@ 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;
+	int value = 0;
+	glGetShaderiv(id, GL_COMPILE_STATUS, &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];
-	glGetShaderInfoLog(id, len+1, reinterpret_cast<GLsizei *>(&len), log);
-	return string(log, len);
+	GLsizei len = 0;
+	glGetShaderiv(id, GL_INFO_LOG_LENGTH, &len);
+	char *buf = new char[len+1];
+	glGetShaderInfoLog(id, len+1, &len, buf);
+	string log(buf, len);
+	delete[] buf;
+	return log;
 }
 
 } // namespace GL