X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fextension.cpp;h=b65172fc691dc4b71e8ba2d4c5dc6e03eac9bfa2;hp=e233ee0012eb60563366d7061acf682ae92f96b9;hb=6a045019fbd68738b77849629e6dfd3dfd9a4d93;hpb=cf89f0205dfad2c8df47217e34302da71bbeda01

diff --git a/source/extension.cpp b/source/extension.cpp
index e233ee00..b65172fc 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -75,10 +75,49 @@ bool is_supported(const string &ext)
 
 	if(!init_done)
 	{
-		if(const char *gl_ext = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)))
+		if(get_gl_api()==OPENGL && get_gl_version()>=Version(3, 0))
 		{
-			vector<string> exts = split(gl_ext);
-			extensions.insert(exts.begin(), exts.end());
+			typedef GLubyte *(APIENTRY *FPtr_glGetStringi)(GLenum, GLuint);
+			FPtr_glGetStringi glGetStringi = reinterpret_cast<FPtr_glGetStringi>(get_proc_address("glGetStringi"));
+			int n_extensions;
+			glGetIntegerv(GL_NUM_EXTENSIONS, &n_extensions);
+			for(int i=0; i<n_extensions; ++i)
+				extensions.insert(reinterpret_cast<const char *>(glGetStringi(GL_EXTENSIONS, i)));
+		}
+		else
+		{
+			if(const char *gl_ext = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)))
+			{
+				vector<string> exts = split(gl_ext);
+				extensions.insert(exts.begin(), exts.end());
+			}
+		}
+
+		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)))
@@ -89,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");
+				if(get_gl_version()<Version(2, 0))
+					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()
@@ -120,6 +152,25 @@ GLApi get_gl_api()
 #endif
 }
 
+inline GLProfile _get_gl_profile()
+{
+	if(get_gl_api()==OPENGL && get_gl_version()>=Version(3, 0))
+	{
+		int mask;
+		glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &mask);
+		if(mask==GL_CONTEXT_CORE_PROFILE_BIT)
+			return CORE_PROFILE;
+	}
+
+	return COMPATIBILITY_PROFILE;
+}
+
+GLProfile get_gl_profile()
+{
+	static GLProfile profile = _get_gl_profile();
+	return profile;
+}
+
 inline Version _get_gl_version()
 {
 	const char *gl_ver_ptr = reinterpret_cast<const char *>(glGetString(GL_VERSION));
@@ -176,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)