Rewrite VertexFormat to support an arbitary amount of components

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

diff --git a/source/shader.cpp b/source/shader.cpp
index 45d56a16070c9fb9f50d892b3b6f17188877f8c5..85451527c28bf8593aa64d8527555eff9aac7647 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");
+               static RequireExtension _ext("GL_ARB_vertex_shader");
 
        id=glCreateShaderObjectARB(t);
-
-       source(src);
-       compile();
 }
 
 Shader::~Shader()
@@ -59,11 +60,11 @@ 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;
+       if(!(compiled=get_param(GL_COMPILE_STATUS)))
+               throw CompileError(get_info_log());
 }
 
 int Shader::get_param(GLenum param) const