X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fextension.cpp;h=b65172fc691dc4b71e8ba2d4c5dc6e03eac9bfa2;hb=4fe225bf15048fcb7a678370f87d09f2de37031a;hp=bceab7ad964e1e3e68fe44bb174b76d8b992fd5b;hpb=a480d4cc323db7cc77388f5af0094dd593dc66e9;p=libs%2Fgl.git

diff --git a/source/extension.cpp b/source/extension.cpp
index bceab7ad..b65172fc 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -2,7 +2,7 @@
 #include <cstdlib>
 #if defined(__ANDROID__)
 #include <EGL/egl.h>
-#elif !defined(WIN32) && !defined(__APPLE__)
+#elif !defined(_WIN32) && !defined(__APPLE__)
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #endif
@@ -75,37 +75,72 @@ 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)));
 		}
-
-		string renderer = reinterpret_cast<const char *>(glGetString(GL_RENDERER));
-		if(renderer.find("Radeon")!=string::npos || renderer.find("AMD")!=string::npos)
+		else
 		{
-			/* 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");
-
-			/* 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(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);
-			for(vector<string>::const_iterator i=disable.begin(); i!=disable.end(); ++i)
-				extensions.erase(*i);
+			disabled_exts.insert(disable.begin(), disable.end());
+		}
+
+		if(const char *renderer_ptr = reinterpret_cast<const char *>(glGetString(GL_RENDERER)))
+		{
+			string renderer = renderer_ptr;
+			if(renderer.find("Radeon")!=string::npos || renderer.find("AMD")!=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. */
+				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))
+					disabled_exts.insert("GL_ARB_uniform_buffer_object");
+			}
 		}
 
 		init_done = true;
 	}
 
-	return extensions.count(ext);
+	return disabled_exts.count(ext);
 }
 
 GLApi get_gl_api()
@@ -117,9 +152,32 @@ 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()
 {
-	string gl_ver = reinterpret_cast<const char *>(glGetString(GL_VERSION));
+	const char *gl_ver_ptr = reinterpret_cast<const char *>(glGetString(GL_VERSION));
+	if(!gl_ver_ptr)
+		throw runtime_error("OpenGL version not available");
+
+	string gl_ver = gl_ver_ptr;
 	if(!gl_ver.compare(0, 10, "OpenGL ES "))
 		gl_ver.erase(0, 10);
 
@@ -143,7 +201,11 @@ const Version &get_gl_version()
 
 inline Version _get_glsl_version()
 {
-	string glsl_ver = reinterpret_cast<const char *>(glGetString(GL_SHADING_LANGUAGE_VERSION));
+	const char *glsl_ver_ptr = reinterpret_cast<const char *>(glGetString(GL_SHADING_LANGUAGE_VERSION));
+	if(!glsl_ver_ptr)
+		throw runtime_error("GLSL version not available");
+
+	string glsl_ver = glsl_ver_ptr;
 	if(!glsl_ver.compare(0, 18, "OpenGL ES GLSL ES "))
 		glsl_ver.erase(0, 18);
 
@@ -165,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)