X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fshader.cpp;h=0c356f5f460826f7e97877881d15f35ba3db36f0;hp=93edafb45b35dab4dac34745cd404d51c1ad12e5;hb=0cacf19c2e6aaa182ae0fcc7dfaae345aedd0e74;hpb=dc1d1159a61f378bda11e5989ad694a86b9a3c77

diff --git a/source/shader.cpp b/source/shader.cpp
index 93edafb4..0c356f5f 100644
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,13 +1,10 @@
-/* $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"
+#include <msp/gl/extensions/arb_fragment_shader.h>
+#include <msp/gl/extensions/arb_geometry_shader4.h>
+#include <msp/gl/extensions/arb_shader_objects.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
+#include <msp/io/print.h>
+#include "error.h"
+#include "misc.h"
 #include "shader.h"
 
 using namespace std;
@@ -15,12 +12,12 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Shader::Shader(ShaderType t)
+Shader::Shader(GLenum t)
 {
 	init(t);
 }
 
-Shader::Shader(ShaderType t, const string &src)
+Shader::Shader(GLenum t, const string &src)
 {
 	init(t);
 
@@ -28,26 +25,28 @@ Shader::Shader(ShaderType t, const string &src)
 	compile();
 }
 
-void Shader::init(ShaderType t)
+void Shader::init(GLenum t)
 {
-	compiled=false;
+	compiled = false;
 
-	if(t==FRAGMENT_SHADER)
-		static RequireExtension _ext("GL_ARB_fragment_program");
-	else if(t==VERTEX_SHADER)
-		static RequireExtension _ext("GL_ARB_vertex_program");
+	if(t==GL_FRAGMENT_SHADER)
+		static Require _req(ARB_fragment_shader);
+	else if(t==GL_VERTEX_SHADER)
+		static Require _req(ARB_vertex_shader);
+	else if(t==GL_GEOMETRY_SHADER)
+		static Require _req(ARB_geometry_shader4);
 
-	id=glCreateShaderObjectARB(t);
+	id = glCreateShader(t);
 }
 
 Shader::~Shader()
 {
-	glDeleteObjectARB(id);
+	glDeleteShader(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);
+	glShaderSource(id, count, str, len);
 }
 
 void Shader::source(const string &str)
@@ -62,25 +61,54 @@ void Shader::source(const char *str, int 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;
+	glCompileShader(id);
+	compiled = get_shader_i(id, GL_COMPILE_STATUS);
+	if(!compiled)
+		throw compile_error(get_info_log());
+
+#ifdef DEBUG
+	string info_log = get_info_log();
+	if(!info_log.empty())
+		IO::print("Shader compile info log:\n%s", info_log);
+#endif
 }
 
 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 = 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)
+{ }
+
+
+GeometryShader::GeometryShader():
+	Shader(GL_GEOMETRY_SHADER)
+{ }
+
+GeometryShader::GeometryShader(const string &src):
+	Shader(GL_GEOMETRY_SHADER, src)
+{ }
+
 } // namespace GL
 } // namespace Msp