Drop Id tags and copyright notices from files

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

diff --git a/source/extension.cpp b/source/extension.cpp
index 6383cd3cee75a524853c1646f193e6795677a2f4..f18067989a8ba97c1a71759ad6a323c00ebdb2fd 100644 (file)
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -1,12 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <set>
 #ifndef WIN32
+#define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #endif
 #include <msp/strings/formatter.h>
@@ -15,10 +9,13 @@ Distributed under the LGPL
 #include "arb_vertex_buffer_object.h"
 #include "arb_vertex_program.h"
 #include "arb_vertex_shader.h"
+#include "ext_framebuffer_blit.h"
+#include "ext_framebuffer_multisample.h"
 #include "ext_framebuffer_object.h"
 #include "except.h"
 #include "extension.h"
 #include "gl.h"
+#include "nv_primitive_restart.h"
 #include "version_1_2.h"
 #include "version_1_3.h"
 
@@ -30,13 +27,13 @@ namespace GL {
 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());
                }
 
@@ -50,28 +47,40 @@ bool is_supported(const string &ext)
                        init_arb_vertex_program();
                if(extensions.count("GL_EXT_framebuffer_object"))
                        init_ext_framebuffer_object();
+               if(extensions.count("GL_EXT_framebuffer_blit"))
+                       init_ext_framebuffer_blit();
+               if(extensions.count("GL_EXT_framebuffer_multisample"))
+                       init_ext_framebuffer_multisample();
                if(extensions.count("GL_ARB_vertex_buffer_object"))
                        init_arb_vertex_buffer_object();
+               if(extensions.count("GL_NV_primitive_restart"))
+                       init_nv_primitive_restart();
 
-               init_done=true;
+               init_done = true;
        }
 
        return extensions.count(ext);
 }
 
+void require_extension(const string &ext)
+{
+       if(!is_supported(ext))
+               throw UnsupportedExtension(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]);
+               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;
+               unsigned combined = version.major*0x100+version.minor;
                if(combined>=0x102)
                        init_version_1_2();
                if(combined>=0x103)
@@ -83,23 +92,22 @@ const Version &get_gl_version()
        return version;
 }
 
-void require_extension(const string &ext)
+bool is_version_at_least(unsigned a, unsigned b)
 {
-       if(!is_supported(ext))
-               throw UnsupportedExtension(ext);
+       const Version &ver = get_gl_version();
+       return (ver.major>a || (ver.major==a && ver.minor>=b));
 }
 
 void require_version(unsigned a, unsigned b)
 {
-       const Version &ver=get_gl_version();
-       if(ver.major<a || (ver.major==a && ver.minor<b))
+       if(!is_version_at_least(a, b))
                throw UnsupportedExtension(format("OpenGL %d.%d", a, b));
 }
 
 ExtFunc *get_proc_address(const string &name)
 {
 #ifndef WIN32
-       return glXGetProcAddressARB(reinterpret_cast<const GLubyte *>(name.c_str()));
+       return glXGetProcAddressARB(reinterpret_cast<const unsigned char *>(name.c_str()));
 #else
        return reinterpret_cast<ExtFunc *>(wglGetProcAddress(name.c_str()));
 #endif