Final touches of OS X support

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

diff --git a/source/extension.cpp b/source/extension.cpp
index 6383cd3cee75a524853c1646f193e6795677a2f4..56f96d4ecee2136dcde2d42f5fbdfa7bbf8b421b 100644 (file)
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -1,59 +1,66 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <set>
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
+#define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #endif
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/strings/utils.h>
-#include "arb_shader_objects.h"
-#include "arb_vertex_buffer_object.h"
-#include "arb_vertex_program.h"
-#include "arb_vertex_shader.h"
-#include "ext_framebuffer_object.h"
-#include "except.h"
+#include "error.h"
 #include "extension.h"
 #include "gl.h"
-#include "version_1_2.h"
-#include "version_1_3.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
+Extension::Extension(const char *n, InitFunc f):
+       name(n),
+       init_func(f),
+       init_done(false),
+       support(UNSUPPORTED)
+{ }
+
+Extension::operator bool() const
+{
+       if(!init_done)
+       {
+               support = init_func();
+               init_done = true;
+       }
+
+       return support>UNSUPPORTED;
+}
+
+
+Require::Require(const Extension &ext)
+{
+       if(!ext)
+               throw unsupported_extension(ext.get_name());
+}
+
+
 bool is_supported(const string &ext)
 {
        static set<string> extensions;
-       static bool init_done=false;
+       static bool init_done = false;
 
        if(!init_done)
        {
-               if(const char *gl_ext=reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)))
+               if(const char *gl_ext = reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS)))
                {
-                       vector<string> exts=split(gl_ext);
+                       vector<string> exts = split(gl_ext);
                        extensions.insert(exts.begin(), exts.end());
                }
 
-               /* XXX Conceptually a bit weird place for this, but I couldn't really come up
-                  with anything better that would still be transparent. */
-               if(extensions.count("GL_ARB_shader_objects"))
-                       init_arb_shader_objects();
-               if(extensions.count("GL_ARB_vertex_shader"))
-                       init_arb_vertex_shader();
-               if(extensions.count("GL_ARB_vertex_program"))
-                       init_arb_vertex_program();
-               if(extensions.count("GL_EXT_framebuffer_object"))
-                       init_ext_framebuffer_object();
-               if(extensions.count("GL_ARB_vertex_buffer_object"))
-                       init_arb_vertex_buffer_object();
-
-               init_done=true;
+               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");
+
+               init_done = true;
        }
 
        return extensions.count(ext);
@@ -62,20 +69,14 @@ bool is_supported(const string &ext)
 const Version &get_gl_version()
 {
        static Version version;
-       static bool init_done=false;
+       static bool init_done = false;
 
        if(!init_done)
        {
-               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]);
-
-               unsigned combined=version.major*0x100+version.minor;
-               if(combined>=0x102)
-                       init_version_1_2();
-               if(combined>=0x103)
-                       init_version_1_3();
+               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]);
 
                init_done = true;
        }
@@ -83,25 +84,21 @@ const Version &get_gl_version()
        return version;
 }
 
-void require_extension(const string &ext)
-{
-       if(!is_supported(ext))
-               throw UnsupportedExtension(ext);
-}
-
-void require_version(unsigned a, unsigned b)
+bool is_version_at_least(unsigned a, unsigned b)
 {
-       const Version &ver=get_gl_version();
-       if(ver.major<a || (ver.major==a && ver.minor<b))
-               throw UnsupportedExtension(format("OpenGL %d.%d", a, b));
+       const Version &ver = get_gl_version();
+       return (ver.major>a || (ver.major==a && ver.minor>=b));
 }
 
 ExtFunc *get_proc_address(const string &name)
 {
-#ifndef WIN32
-       return glXGetProcAddressARB(reinterpret_cast<const GLubyte *>(name.c_str()));
-#else
+#if defined(WIN32)
        return reinterpret_cast<ExtFunc *>(wglGetProcAddress(name.c_str()));
+#elif defined(__APPLE__)
+       (void)name;
+       return 0;  // Not supported
+#else
+       return glXGetProcAddressARB(reinterpret_cast<const unsigned char *>(name.c_str()));
 #endif
 }