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

diff --git a/source/extension.cpp b/source/extension.cpp
index d0361665..e233ee00 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -1,5 +1,8 @@
 #include <set>
-#if !defined(WIN32) && !defined(__APPLE__)
+#include <cstdlib>
+#if defined(__ANDROID__)
+#include <EGL/egl.h>
+#elif !defined(_WIN32) && !defined(__APPLE__)
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #endif
@@ -78,12 +81,29 @@ bool is_supported(const string &ext)
 			extensions.insert(exts.begin(), exts.end());
 		}
 
-		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");
+		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. */
+				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 *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;
 	}
@@ -91,10 +111,35 @@ bool is_supported(const string &ext)
 	return extensions.count(ext);
 }
 
+GLApi get_gl_api()
+{
+#ifdef GL_ES_VERSION_2_0
+	return OPENGL_ES2;
+#else
+	return OPENGL;
+#endif
+}
+
 inline Version _get_gl_version()
 {
-	string gl_ver = reinterpret_cast<const char *>(glGetString(GL_VERSION));
-	return Version(gl_ver.substr(0, gl_ver.find(' ')));
+	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);
+
+	Version ver(gl_ver.substr(0, gl_ver.find(' ')));
+
+	if(const char *force_ver_ptr = getenv("MSPGL_FORCE_VERSION"))
+	{
+		Version force_ver(force_ver_ptr);
+		if(!(force_ver>=ver))
+			ver = force_ver;
+	}
+
+	return ver;
 }
 
 const Version &get_gl_version()
@@ -105,8 +150,24 @@ const Version &get_gl_version()
 
 inline Version _get_glsl_version()
 {
-	string glsl_ver = reinterpret_cast<const char *>(glGetString(GL_SHADING_LANGUAGE_VERSION));
-	return Version(glsl_ver.substr(0, glsl_ver.find(' ')));
+	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);
+
+	Version ver(glsl_ver.substr(0, glsl_ver.find(' ')));
+
+	if(const char *force_ver_ptr = getenv("MSPGL_FORCE_GLSL_VERSION"))
+	{
+		Version force_ver(force_ver_ptr);
+		if(!(force_ver>=ver))
+			ver = force_ver;
+	}
+
+	return ver;
 }
 
 const Version &get_glsl_version()
@@ -127,6 +188,8 @@ ExtFunc *get_proc_address(const string &name)
 #elif defined(__APPLE__)
 	(void)name;
 	return 0;  // Not supported
+#elif defined(__ANDROID__)
+	return eglGetProcAddress(name.c_str());
 #else
 	return glXGetProcAddressARB(reinterpret_cast<const unsigned char *>(name.c_str()));
 #endif