X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fextension.cpp;h=41b06b217f79c9df88c83498eb595d41cbecaca9;hb=73f829d3051f5c6c02ce629991f1757d1586bf74;hp=9ed1777914b9076c89f8c55ba58f0a6012ca54db;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/extension.cpp b/source/extension.cpp
index 9ed17779..41b06b21 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -1,33 +1,70 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007, 2009-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <set>
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #endif
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.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 "error.h"
 #include "extension.h"
 #include "gl.h"
-#include "version_1_2.h"
-#include "version_1_3.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
+Version::Version()
+{
+	major = 0;
+	minor = 0;
+}
+
+Version::Version(unsigned short a, unsigned short i)
+{
+	major = a;
+	minor = i;
+}
+
+Version::Version(const string &s)
+{
+	vector<string> parts = split(s, '.');
+	major = lexical_cast<unsigned>(parts[0]);
+	minor = lexical_cast<unsigned>(parts[1]);
+}
+
+bool Version::operator>=(const Version &other) const
+{
+	return major>other.major || (major==other.major && minor>=other.minor);
+}
+
+
+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;
@@ -41,18 +78,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_ARB_vertex_buffer_object"))
-			init_arb_vertex_buffer_object();
+		string renderer = reinterpret_cast<const char *>(glGetString(GL_RENDERER));
+		if(renderer.find("Radeon")!=string::npos)
+			/* Radeon doesn't process NV_primitive_restart correctly and treats
+			the restart index as a normal element if the indices are stored in a
+			buffer. */
+			extensions.erase("GL_NV_primitive_restart");
 
 		init_done = true;
 	}
@@ -60,49 +91,32 @@ bool is_supported(const string &ext)
 	return extensions.count(ext);
 }
 
-const Version &get_gl_version()
+inline 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;
+	string gl_ver = reinterpret_cast<const char *>(glGetString(GL_VERSION));
+	return Version(gl_ver.substr(0, gl_ver.find(' ')));
 }
 
-void require_extension(const string &ext)
+const Version &get_gl_version()
 {
-	if(!is_supported(ext))
-		throw UnsupportedExtension(ext);
+	static Version version = _get_gl_version();
+	return version;
 }
 
-void require_version(unsigned a, unsigned b)
+bool is_version_at_least(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));
+	return get_gl_version()>=Version(a, b);
 }
 
 ExtFunc *get_proc_address(const string &name)
 {
-#ifndef WIN32
-	return glXGetProcAddressARB(reinterpret_cast<const unsigned char *>(name.c_str()));
-#else
+#if defined(WIN32)
 	return reinterpret_cast<ExtFunc *>(wglGetProcAddress(name.c_str()));
+#elif defined(__APPLE__)
+	(void)name;
+	return 0;  // Not supported
+#else
+	return glXGetProcAddressARB(reinterpret_cast<const unsigned char *>(name.c_str()));
 #endif
 }