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

diff --git a/source/extension.cpp b/source/extension.cpp
index fda183d2..b65172fc 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -93,6 +93,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 +128,19 @@ 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");
 
 				/* 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()
@@ -207,11 +227,6 @@ 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)