X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fextension.cpp;h=6383cd3cee75a524853c1646f193e6795677a2f4;hb=e20075bffbbe1f3aaa9cc149953525a7e855f496;hp=e250bb249c9f04fd9fce24ebd3a42762ded9657d;hpb=a361efc05fcad11b2918f3cd7abdebe794b131d8;p=libs%2Fgl.git

diff --git a/source/extension.cpp b/source/extension.cpp
index e250bb24..6383cd3c 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -6,16 +6,21 @@ Distributed under the LGPL
 */
 
 #include <set>
-#include <GL/gl.h>
 #ifndef WIN32
 #include <GL/glx.h>
 #endif
+#include <msp/strings/formatter.h>
 #include <msp/strings/utils.h>
 #include "arb_shader_objects.h"
+#include "arb_vertex_buffer_object.h"
+#include "arb_vertex_program.h"
 #include "arb_vertex_shader.h"
 #include "ext_framebuffer_object.h"
 #include "except.h"
 #include "extension.h"
+#include "gl.h"
+#include "version_1_2.h"
+#include "version_1_3.h"
 
 using namespace std;
 
@@ -41,8 +46,12 @@ bool is_supported(const string &ext)
 			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_ARB_vertex_buffer_object"))
+			init_arb_vertex_buffer_object();
 
 		init_done=true;
 	}
@@ -50,16 +59,49 @@ bool is_supported(const string &ext)
 	return extensions.count(ext);
 }
 
+const Version &get_gl_version()
+{
+	static Version version;
+	static bool init_done=false;
+
+	if(!init_done)
+	{
+		string gl_ver=reinterpret_cast<const char *>(glGetString(GL_VERSION));
+		vector<string> parts=split(gl_ver.substr(0, gl_ver.find(' ')), '.');
+		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;
+	}
+
+	return version;
+}
+
 void require_extension(const string &ext)
 {
 	if(!is_supported(ext))
-		throw UnsupportedExtension(ext+" is not supported");
+		throw UnsupportedExtension(ext);
+}
+
+void require_version(unsigned a, unsigned b)
+{
+	const Version &ver=get_gl_version();
+	if(ver.major<a || (ver.major==a && ver.minor<b))
+		throw UnsupportedExtension(format("OpenGL %d.%d", a, b));
 }
 
 ExtFunc *get_proc_address(const string &name)
 {
 #ifndef WIN32
 	return glXGetProcAddressARB(reinterpret_cast<const GLubyte *>(name.c_str()));
+#else
+	return reinterpret_cast<ExtFunc *>(wglGetProcAddress(name.c_str()));
 #endif
 }