Drop Shader::get_param and Program::get_param

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

diff --git a/source/shader.cpp b/source/shader.cpp
index 45d56a16070c9fb9f50d892b3b6f17188877f8c5..c7a08bfac5e0b71f5371cf841506b21c463e845f 100644 (file)
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -6,6 +6,7 @@ Distributed under the LGPL
 */
 
 #include "arb_shader_objects.h"
+#include "except.h"
 #include "extension.h"
 #include "shader.h"
 
@@ -14,29 +15,29 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Shader::Shader(ShaderType t):
-       compiled(false)
+Shader::Shader(ShaderType t)
 {
-       if(t==FRAGMENT_SHADER)
-               require_extension("GL_ARB_fragment_program");
-       else if(t==VERTEX_SHADER)
-               require_extension("GL_ARB_vertex_program");
+       init(t);
+}
 
-       id=glCreateShaderObjectARB(t);
+Shader::Shader(ShaderType t, const string &src)
+{
+       init(t);
+
+       source(src);
+       compile();
 }
 
-Shader::Shader(ShaderType t, const string &src):
-       compiled(false)
+void Shader::init(ShaderType t)
 {
+       compiled = false;
+
        if(t==FRAGMENT_SHADER)
-               require_extension("GL_ARB_fragment_program");
+               static RequireExtension _ext("GL_ARB_fragment_shader");
        else if(t==VERTEX_SHADER)
-               require_extension("GL_ARB_vertex_program");
-
-       id=glCreateShaderObjectARB(t);
+               static RequireExtension _ext("GL_ARB_vertex_shader");
 
-       source(src);
-       compile();
+       id = glCreateShaderObjectARB(t);
 }
 
 Shader::~Shader()
@@ -44,7 +45,7 @@ Shader::~Shader()
        glDeleteObjectARB(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);
 }
@@ -59,25 +60,21 @@ void Shader::source(const char *str, int len)
        source(1, &str, &len);
 }
 
-bool Shader::compile()
+void Shader::compile()
 {
        glCompileShaderARB(id);
-       compiled=get_param(GL_COMPILE_STATUS);
-       return compiled;
-}
-
-int Shader::get_param(GLenum param) const
-{
-       int value;
-       glGetObjectParameterivARB(id, param, &value);
-       return value;
+       int value = 0;
+       glGetObjectParameterivARB(id, GL_OBJECT_COMPILE_STATUS_ARB, &value);
+       if(!(compiled = value))
+               throw CompileError(get_info_log());
 }
 
 string Shader::get_info_log() const
 {
-       sizei len=get_param(GL_INFO_LOG_LENGTH);
+       GLsizei len = 0;
+       glGetObjectParameterivARB(id, GL_OBJECT_INFO_LOG_LENGTH_ARB, &len);
        char log[len+1];
-       glGetInfoLogARB(id, len+1, reinterpret_cast<GLsizei *>(&len), log);
+       glGetInfoLogARB(id, len+1, &len, log);
        return string(log, len);
 }