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

diff --git a/source/extension.cpp b/source/extension.cpp
index efa4b1a2..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,18 +81,21 @@ 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)
+		if(const char *renderer_ptr = reinterpret_cast<const char *>(glGetString(GL_RENDERER)))
 		{
-			/* 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");
+			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"))
@@ -105,9 +111,25 @@ 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));
+	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"))
@@ -128,7 +150,14 @@ 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);
+
 	Version ver(glsl_ver.substr(0, glsl_ver.find(' ')));
 
 	if(const char *force_ver_ptr = getenv("MSPGL_FORCE_GLSL_VERSION"))
@@ -159,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