X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fshader.cpp;h=85451527c28bf8593aa64d8527555eff9aac7647;hb=e77c027ce8efb5dafd93bdd0f77504218a955665;hp=3c01242650d3bd26009a0a57711e34dc4a0779f7;hpb=85e83ace47e5a9a8ae7263886255dd81afc69278;p=libs%2Fgl.git

diff --git a/source/shader.cpp b/source/shader.cpp
index 3c012426..85451527 100644
--- 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_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()