X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fextension.cpp;h=8618cc3eeef599e7c7a1dc36fe2ef724f234e91f;hb=47bfbdc8cf844aa079995fca34a3b906b49a4f66;hp=692037c3b174583bf7f35ea2c1afae98413140e9;hpb=46086017e46264d06c72a7ca09f7416615f3bc1b;p=libs%2Fgl.git

diff --git a/source/extension.cpp b/source/extension.cpp
index 692037c3..8618cc3e 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
@@ -137,10 +139,8 @@ bool is_disabled(const string &ext)
 			string renderer = renderer_ptr;
 			if(renderer.find("Radeon")!=string::npos || renderer.find("AMD")!=string::npos)
 			{
-				/* Radeon doesn't process NV_primitive_restart correctly and treats
-				the restart index as a normal element if the indices are stored in a
-				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. */
@@ -198,7 +198,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;
 	}
 
@@ -226,7 +226,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;
 	}