X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fextension.cpp;h=6ca4f08ce61728da8a1a9c994880be0d85810a97;hp=bc43ae8bbbee902533c24a8c05b071aed1eb2b41;hb=6afbace895a7bbcf216ab8e48280ea0303ab5892;hpb=485315ca65cb40f33253008a79b0933997bd74f5

diff --git a/source/extension.cpp b/source/extension.cpp
index bc43ae8b..6ca4f08c 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -5,26 +5,41 @@
 #endif
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
-#include "arb_shader_objects.h"
-#include "arb_uniform_buffer_object.h"
-#include "arb_vertex_buffer_object.h"
-#include "arb_vertex_program.h"
-#include "arb_vertex_shader.h"
 #include "error.h"
-#include "ext_framebuffer_blit.h"
-#include "ext_framebuffer_multisample.h"
-#include "ext_framebuffer_object.h"
 #include "extension.h"
 #include "gl.h"
-#include "nv_primitive_restart.h"
-#include "version_1_2.h"
-#include "version_1_3.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
+Extension::Extension(const char *n, InitFunc f):
+	name(n),
+	init_func(f),
+	init_done(false),
+	support(UNSUPPORTED)
+{ }
+
+Extension::operator bool() const
+{
+	if(!init_done)
+	{
+		support = init_func();
+		init_done = true;
+	}
+
+	return support>UNSUPPORTED;
+}
+
+
+Require::Require(const Extension &ext)
+{
+	if(!ext)
+		throw unsupported_extension(ext.get_name());
+}
+
+
 bool is_supported(const string &ext)
 {
 	static set<string> extensions;
@@ -38,39 +53,12 @@ bool is_supported(const string &ext)
 			extensions.insert(exts.begin(), exts.end());
 		}
 
-		/* XXX Conceptually a bit weird place for this, but I couldn't really come up
-		with anything better that would still be transparent. */
-		if(extensions.count("GL_ARB_shader_objects"))
-			init_arb_shader_objects();
-		if(extensions.count("GL_ARB_vertex_shader"))
-			init_arb_vertex_shader();
-		if(extensions.count("GL_ARB_vertex_program"))
-			init_arb_vertex_program();
-		if(extensions.count("GL_EXT_framebuffer_object"))
-			init_ext_framebuffer_object();
-		if(extensions.count("GL_EXT_framebuffer_blit"))
-			init_ext_framebuffer_blit();
-		if(extensions.count("GL_EXT_framebuffer_multisample"))
-			init_ext_framebuffer_multisample();
-		if(extensions.count("GL_ARB_vertex_buffer_object"))
-			init_arb_vertex_buffer_object();
-		if(extensions.count("GL_NV_primitive_restart"))
-			init_nv_primitive_restart();
-		if(extensions.count("GL_ARB_uniform_buffer_object"))
-			init_arb_uniform_buffer_object();
-
 		init_done = true;
 	}
 
 	return extensions.count(ext);
 }
 
-void require_extension(const string &ext)
-{
-	if(!is_supported(ext))
-		throw unsupported_extension(ext);
-}
-
 const Version &get_gl_version()
 {
 	static Version version;
@@ -83,12 +71,6 @@ const Version &get_gl_version()
 		version.major = lexical_cast<unsigned>(parts[0]);
 		version.minor = lexical_cast<unsigned>(parts[1]);
 
-		unsigned combined = version.major*0x100+version.minor;
-		if(combined>=0x102)
-			init_version_1_2();
-		if(combined>=0x103)
-			init_version_1_3();
-
 		init_done = true;
 	}
 
@@ -101,12 +83,6 @@ bool is_version_at_least(unsigned a, unsigned b)
 	return (ver.major>a || (ver.major==a && ver.minor>=b));
 }
 
-void require_version(unsigned a, unsigned b)
-{
-	if(!is_version_at_least(a, b))
-		throw unsupported_extension(format("OpenGL %d.%d", a, b));
-}
-
 ExtFunc *get_proc_address(const string &name)
 {
 #ifndef WIN32