X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fextension.cpp;h=21fab9a290161b55cb46d234bb5cb43ffa742a08;hb=03e6c23f8141c5a1723c8acee00a46a15b0777be;hp=2dc298c1f5105f13892d2d499567fd0112424a1e;hpb=ab2cda34b99f122a647c1457e8cb0b46715802af;p=libs%2Fgl.git

diff --git a/source/extension.cpp b/source/extension.cpp
index 2dc298c1..21fab9a2 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -2,7 +2,9 @@
 #include <cstdlib>
 #if defined(__ANDROID__)
 #include <EGL/egl.h>
-#elif !defined(_WIN32) && !defined(__APPLE__)
+#elif defined(_WIN32)
+#include <windows.h>
+#elif !defined(__APPLE__)
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #endif
@@ -79,6 +81,9 @@ Require::Require(const Extension &ext)
 
 bool is_supported(const string &ext)
 {
+	if(is_disabled(ext))
+		return false;
+
 	static set<string> extensions;
 	static bool init_done = false;
 
@@ -139,6 +144,9 @@ bool is_disabled(const string &ext)
 				buffer. */
 				disabled_exts.insert("GL_NV_primitive_restart");
 
+				// The core primitive restart feature does not work either.
+				disabled_exts.insert("GL_MSP_primitive_restart");
+
 				/* AMD's uniform buffer objects only work with the core version of
 				shaders. */
 				if(get_gl_version()<Version(2, 0))
@@ -195,7 +203,7 @@ inline Version _get_gl_version()
 	if(const char *force_ver_ptr = getenv("MSPGL_FORCE_VERSION"))
 	{
 		Version force_ver(force_ver_ptr);
-		if(!(force_ver>=ver))
+		if(force_ver<ver)
 			ver = force_ver;
 	}
 
@@ -223,7 +231,7 @@ inline Version _get_glsl_version()
 	if(const char *force_ver_ptr = getenv("MSPGL_FORCE_GLSL_VERSION"))
 	{
 		Version force_ver(force_ver_ptr);
-		if(!(force_ver>=ver))
+		if(force_ver<ver)
 			ver = force_ver;
 	}