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

diff --git a/source/extension.cpp b/source/extension.cpp
index a5ad3191..9ed17779 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -1,18 +1,20 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007, 2009-2010  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/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"
@@ -29,13 +31,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());
 		}
 
@@ -45,12 +47,14 @@ bool is_supported(const string &ext)
 			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;
+		init_done = true;
 	}
 
 	return extensions.count(ext);
@@ -59,20 +63,22 @@ 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]);
+		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)
 			init_version_1_3();
+
+		init_done = true;
 	}
 
 	return version;
@@ -86,7 +92,7 @@ void require_extension(const string &ext)
 
 void require_version(unsigned a, unsigned b)
 {
-	const Version &ver=get_gl_version();
+	const Version &ver = get_gl_version();
 	if(ver.major<a || (ver.major==a && ver.minor<b))
 		throw UnsupportedExtension(format("OpenGL %d.%d", a, b));
 }
@@ -94,7 +100,7 @@ void require_version(unsigned a, unsigned 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