X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fextension.cpp;h=a095986123dd535d192881c2870649ae8e936e43;hp=fda183d22f374ea309851019fbcc4f271d8d430a;hb=4598d28936d3a4772927d1e3a1534f872731b358;hpb=5b3aa68610238de4e6f13c4bf9ec1745751e820c

diff --git a/source/extension.cpp b/source/extension.cpp
index fda183d2..a0959861 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -12,6 +12,15 @@
 #include "extension.h"
 #include "gl.h"
 
+#ifndef GL_VERSION_3_0
+#define GL_NUM_EXTENSIONS 0x821D
+#endif
+
+#ifndef GL_VERSION_3_2
+#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001
+#define GL_CONTEXT_PROFILE_MASK 0x9126
+#endif
+
 using namespace std;
 
 namespace Msp {
@@ -70,6 +79,9 @@ Require::Require(const Extension &ext)
 
 bool is_supported(const string &ext)
 {
+	if(is_disabled(ext))
+		return false;
+
 	static set<string> extensions;
 	static bool init_done = false;
 
@@ -93,6 +105,33 @@ bool is_supported(const string &ext)
 			}
 		}
 
+		init_done = true;
+	}
+
+	return extensions.count(ext);
+}
+
+bool is_supported(const Version &core_version, const Version &deprecated_version)
+{
+	const Version &version = get_gl_version();
+	if(deprecated_version && version>=deprecated_version && get_gl_profile()==CORE_PROFILE)
+		return false;
+	return (version>=core_version);
+}
+
+bool is_disabled(const string &ext)
+{
+	static set<string> disabled_exts;
+	static bool init_done = false;
+
+	if(!init_done)
+	{
+		if(const char *disable_ptr = getenv("MSPGL_DISABLE_EXTENSIONS"))
+		{
+			vector<string> disable = split(disable_ptr);
+			disabled_exts.insert(disable.begin(), disable.end());
+		}
+
 		if(const char *renderer_ptr = reinterpret_cast<const char *>(glGetString(GL_RENDERER)))
 		{
 			string renderer = renderer_ptr;
@@ -101,26 +140,22 @@ bool is_supported(const string &ext)
 				/* 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");
+				disabled_exts.insert("GL_NV_primitive_restart");
+
+				// The core primitive restart feature does not work either.
+				disabled_exts.insert("GL_MSP_primitive_restart");
 
 				/* AMD's uniform buffer objects only work with the core version of
 				shaders. */
 				if(get_gl_version()<Version(2, 0))
-					extensions.erase("GL_ARB_uniform_buffer_object");
+					disabled_exts.insert("GL_ARB_uniform_buffer_object");
 			}
 		}
 
-		if(const char *disable_ptr = getenv("MSPGL_DISABLE_EXTENSIONS"))
-		{
-			vector<string> disable = split(disable_ptr);
-			for(vector<string>::const_iterator i=disable.begin(); i!=disable.end(); ++i)
-				extensions.erase(*i);
-		}
-
 		init_done = true;
 	}
 
-	return extensions.count(ext);
+	return disabled_exts.count(ext);
 }
 
 GLApi get_gl_api()
@@ -166,7 +201,7 @@ inline Version _get_gl_version()
 	if(const char *force_ver_ptr = getenv("MSPGL_FORCE_VERSION"))
 	{
 		Version force_ver(force_ver_ptr);
-		if(!(force_ver>=ver))
+		if(force_ver<ver)
 			ver = force_ver;
 	}
 
@@ -194,7 +229,7 @@ inline Version _get_glsl_version()
 	if(const char *force_ver_ptr = getenv("MSPGL_FORCE_GLSL_VERSION"))
 	{
 		Version force_ver(force_ver_ptr);
-		if(!(force_ver>=ver))
+		if(force_ver<ver)
 			ver = force_ver;
 	}
 
@@ -207,14 +242,9 @@ const Version &get_glsl_version()
 	return version;
 }
 
-bool is_version_at_least(unsigned a, unsigned b)
-{
-	return get_gl_version()>=Version(a, b);
-}
-
 ExtFunc *get_proc_address(const string &name)
 {
-#if defined(WIN32)
+#if defined(_WIN32)
 	return reinterpret_cast<ExtFunc *>(wglGetProcAddress(name.c_str()));
 #elif defined(__APPLE__)
 	(void)name;