Remove the deprecated ProgramBuilder class

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

diff --git a/source/shader.cpp b/source/shader.cpp
index 0da1a6e9df448028cc9518e23c12207dbf751723..02dcc0dcff789fe142f9b47d4bde5ad2e48fe7fa 100644 (file)
--- 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;
@@ -24,12 +27,15 @@ Shader::Shader(GLenum t, const string &src)
 
 void Shader::init(GLenum t)
 {
+       static Require _req_base(ARB_shader_objects);
        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);
+       else if(t==GL_GEOMETRY_SHADER)
+               static Require _req(ARB_geometry_shader4);
 
        id = glCreateShader(t);
 }
@@ -57,20 +63,23 @@ 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);
-       char *buf = new char[len+1];
-       glGetShaderInfoLog(id, len+1, &len, buf);
-       string log(buf, len);
-       delete[] buf;
+       GLsizei len = get_shader_i(id, GL_INFO_LOG_LENGTH);
+       string log(len+1, 0);
+       glGetShaderInfoLog(id, len+1, &len, &log[0]);
+       log.erase(len);
        return log;
 }
 
@@ -92,5 +101,14 @@ 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