Always update program uniforms if uniform names have changed

[libs/gl.git] / source / extension.cpp

diff --git a/source/extension.cpp b/source/extension.cpp
index 56f96d4ecee2136dcde2d42f5fbdfa7bbf8b421b..023510da4bdce0d751317735800eb06329477559 100644 (file)
--- 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
@@ -14,6 +17,31 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+Version::Version()
+{
+       major = 0;
+       minor = 0;
+}
+
+Version::Version(unsigned short a, unsigned short i)
+{
+       major = a;
+       minor = i;
+}
+
+Version::Version(const string &s)
+{
+       vector<string> parts = split(s, '.');
+       major = lexical_cast<unsigned>(parts[0]);
+       minor = lexical_cast<unsigned>(parts[1]);
+}
+
+bool Version::operator>=(const Version &other) const
+{
+       return major>other.major || (major==other.major && minor>=other.minor);
+}
+
+
 Extension::Extension(const char *n, InitFunc f):
        name(n),
        init_func(f),
@@ -55,39 +83,91 @@ bool is_supported(const string &ext)
 
                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");
 
+                       /* 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;
        }
 
        return extensions.count(ext);
 }
 
-const Version &get_gl_version()
+GLApi get_gl_api()
 {
-       static Version version;
-       static bool init_done = false;
+#ifdef GL_ES_VERSION_2_0
+       return OPENGL_ES2;
+#else
+       return OPENGL;
+#endif
+}
 
-       if(!init_done)
+inline Version _get_gl_version()
+{
+       string gl_ver = reinterpret_cast<const char *>(glGetString(GL_VERSION));
+       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"))
        {
-               string gl_ver = reinterpret_cast<const char *>(glGetString(GL_VERSION));
-               vector<string> parts = split(gl_ver.substr(0, gl_ver.find(' ')), '.');
-               version.major = lexical_cast<unsigned>(parts[0]);
-               version.minor = lexical_cast<unsigned>(parts[1]);
+               Version force_ver(force_ver_ptr);
+               if(!(force_ver>=ver))
+                       ver = force_ver;
+       }
 
-               init_done = true;
+       return ver;
+}
+
+const Version &get_gl_version()
+{
+       static Version version = _get_gl_version();
+       return version;
+}
+
+inline Version _get_glsl_version()
+{
+       string glsl_ver = reinterpret_cast<const char *>(glGetString(GL_SHADING_LANGUAGE_VERSION));
+       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()
+{
+       static Version version = _get_glsl_version();
        return version;
 }
 
 bool is_version_at_least(unsigned a, unsigned b)
 {
-       const Version &ver = get_gl_version();
-       return (ver.major>a || (ver.major==a && ver.minor>=b));
+       return get_gl_version()>=Version(a, b);
 }
 
 ExtFunc *get_proc_address(const string &name)
@@ -97,6 +177,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