Use RAII checks for extensions and versions

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

diff --git a/source/shader.cpp b/source/shader.cpp
index 3c01242650d3bd26009a0a57711e34dc4a0779f7..93edafb45b35dab4dac34745cd404d51c1ad12e5 100644 (file)
--- a/source/shader.cpp
+++ b/source/shader.cpp
@@ -15,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_program");
        else if(t==VERTEX_SHADER)
-               require_extension("GL_ARB_vertex_program");
+               static RequireExtension _ext("GL_ARB_vertex_program");
 
        id=glCreateShaderObjectARB(t);
-
-       source(src);
-       compile();
 }
 
 Shader::~Shader()