Get all blocks for the program before applying them

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

diff --git a/source/extension.cpp b/source/extension.cpp
index fbed6e2648c610595ee03451429d19c681416c92..c846c59d72398dc0c1cbdbf59d03859871cc3ca2 100644 (file)
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -1,25 +1,19 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007, 2009-2011  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>
+#include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "arb_shader_objects.h"
+#include "arb_uniform_buffer_object.h"
 #include "arb_vertex_buffer_object.h"
 #include "arb_vertex_program.h"
 #include "arb_vertex_shader.h"
+#include "error.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"
@@ -62,6 +56,8 @@ bool is_supported(const string &ext)
                        init_arb_vertex_buffer_object();
                if(extensions.count("GL_NV_primitive_restart"))
                        init_nv_primitive_restart();
+               if(extensions.count("GL_ARB_uniform_buffer_object"))
+                       init_arb_uniform_buffer_object();
 
                init_done = true;
        }
@@ -72,7 +68,7 @@ bool is_supported(const string &ext)
 void require_extension(const string &ext)
 {
        if(!is_supported(ext))
-               throw UnsupportedExtension(ext);
+               throw unsupported_extension(ext);
 }
 
 const Version &get_gl_version()
@@ -108,7 +104,7 @@ bool is_version_at_least(unsigned a, unsigned b)
 void require_version(unsigned a, unsigned b)
 {
        if(!is_version_at_least(a, b))
-               throw UnsupportedExtension(format("OpenGL %d.%d", a, b));
+               throw unsupported_extension(format("OpenGL %d.%d", a, b));
 }
 
 ExtFunc *get_proc_address(const string &name)