X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fextension.cpp;h=f18067989a8ba97c1a71759ad6a323c00ebdb2fd;hp=9ed1777914b9076c89f8c55ba58f0a6012ca54db;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d

diff --git a/source/extension.cpp b/source/extension.cpp
index 9ed17779..f1806798 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007, 2009-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <set>
 #ifndef WIN32
 #define GLX_GLXEXT_PROTOTYPES
@@ -16,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"
 
@@ -51,8 +47,14 @@ 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;
 	}
@@ -60,6 +62,12 @@ bool is_supported(const string &ext)
 	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;
@@ -84,16 +92,15 @@ 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));
 }