Fix a stupid error with PixelStore parameter mask

[libs/gl.git] / source / shader.cpp

diff --git a/source/shader.cpp b/source/shader.cpp
index cdb50c969d59edaf2dfc7edc044579192632eed7..0c356f5f460826f7e97877881d15f35ba3db36f0 100644 (file)
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -1,6 +1,10 @@
-#include "arb_shader_objects.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 "extension.h"
+#include "misc.h"
 #include "shader.h"
 
 using namespace std;
@@ -8,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);
 
@@ -21,26 +25,28 @@ Shader::Shader(ShaderType t, const string &src)
        compile();
 }
 
-void Shader::init(ShaderType t)
+void Shader::init(GLenum t)
 {
        compiled = false;
 
-       if(t==FRAGMENT_SHADER)
-               static RequireExtension _ext("GL_ARB_fragment_shader");
-       else if(t==VERTEX_SHADER)
-               static RequireExtension _ext("GL_ARB_vertex_shader");
+       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(unsigned count, const char **str, const int *len)
 {
-       glShaderSourceARB(id, count, str, len);
+       glShaderSource(id, count, str, len);
 }
 
 void Shader::source(const string &str)
@@ -55,23 +61,54 @@ void Shader::source(const char *str, int len)
 
 void Shader::compile()
 {
-       glCompileShaderARB(id);
-       int value = 0;
-       glGetObjectParameterivARB(id, GL_OBJECT_COMPILE_STATUS_ARB, &value);
-       if(!(compiled = 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
 {
-       GLsizei len = 0;
-       glGetObjectParameterivARB(id, GL_OBJECT_INFO_LOG_LENGTH_ARB, &len);
+       GLsizei len = get_shader_i(id, GL_INFO_LOG_LENGTH);
        char *buf = new char[len+1];
-       glGetInfoLogARB(id, len+1, &len, buf);
+       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