Don't require OpenGL extensions to be reported, if present in the rep…

…orted OpenGL version.
Warzone2100 · Jun 21, 2012 · e8ee5e6 · e8ee5e6
1 parent 9784c65
commit e8ee5e6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/ivis_opengl/screen.cpp b/lib/ivis_opengl/screen.cpp
@@ -166,7 +166,9 @@ bool screenInitialise()
 		debug(LOG_3D, "  * (current) Max Sample level is %d.", (int) glmaxSamples);
 	}
 
-	bool canRunAtAll = GLEW_VERSION_1_2 && GLEW_ARB_vertex_buffer_object && GLEW_ARB_texture_env_crossbar;
+	bool haveARB_vertex_buffer_object = GLEW_ARB_vertex_buffer_object || GLEW_VERSION_1_5;
+	bool haveARB_texture_env_crossbar = GLEW_ARB_texture_env_crossbar || GLEW_NV_texture_env_combine4 || GLEW_VERSION_1_4;
+	bool canRunAtAll = GLEW_VERSION_1_2 && haveARB_vertex_buffer_object && haveARB_texture_env_crossbar;
 	bool canRunShaders = canRunAtAll && glslVersion >= std::make_pair(1, 20);  // glGetString(GL_SHADING_LANGUAGE_VERSION) >= "1.20"
 
 	if (canRunShaders)