X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fextension.cpp;h=c543328b6550236819bbcb727440e3178cc9bf6e;hb=ad3238a5acffa0f200a550c5668c18d931d1c569;hp=51a84db695465038d0732df53f1d84c6e31cbb2c;hpb=3e17c84968553e58cb09d397cafaead82e51d478;p=libs%2Fgl.git

diff --git a/source/extension.cpp b/source/extension.cpp
index 51a84db6..c543328b 100644
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -79,6 +79,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 +142,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))
@@ -238,7 +244,7 @@ const Version &get_glsl_version()
 
 ExtFunc *get_proc_address(const string &name)
 {
-#if defined(WIN32)
+#if defined(_WIN32)
 	return reinterpret_cast<ExtFunc *>(wglGetProcAddress(name.c_str()));
 #elif defined(__APPLE__)
 	(void)name;