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

diff --git a/source/shader.cpp b/source/shader.cpp
index b0cf5a3e..0c356f5f 100644
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,7 +1,10 @@
-#include "arb_fragment_shader.h"
-#include "arb_shader_objects.h"
-#include "arb_vertex_shader.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;
@@ -9,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);
 
@@ -22,14 +25,16 @@ Shader::Shader(ShaderType t, const string &src)
 	compile();
 }
 
-void Shader::init(ShaderType t)
+void Shader::init(GLenum t)
 {
 	compiled = false;
 
-	if(t==FRAGMENT_SHADER)
+	if(t==GL_FRAGMENT_SHADER)
 		static Require _req(ARB_fragment_shader);
-	else if(t==VERTEX_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 = glCreateShader(t);
 }
@@ -57,16 +62,20 @@ void Shader::source(const char *str, int len)
 void Shader::compile()
 {
 	glCompileShader(id);
-	int value = 0;
-	glGetShaderiv(id, GL_COMPILE_STATUS, &value);
-	if(!(compiled = value))
+	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
 {
-	GLsizei len = 0;
-	glGetShaderiv(id, GL_INFO_LOG_LENGTH, &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);
@@ -74,5 +83,32 @@ string Shader::get_info_log() const
 	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