Don't require texture_env_crossbar for shaders.

Refs. #3575.
Warzone2100 · Jun 26, 2012 · 64a3cc1 · 64a3cc1
1 parent 845903e
commit 64a3cc1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/ivis_opengl/screen.cpp b/lib/ivis_opengl/screen.cpp
@@ -168,8 +168,8 @@ bool screenInitialise()
 
 	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"
+	bool canRunFallback = GLEW_VERSION_1_2 && haveARB_vertex_buffer_object && haveARB_texture_env_crossbar;
+	bool canRunShaders = GLEW_VERSION_1_2 && haveARB_vertex_buffer_object && glslVersion >= std::make_pair(1, 20);  // glGetString(GL_SHADING_LANGUAGE_VERSION) >= "1.20"
 
 	if (canRunShaders)
 	{
@@ -179,7 +179,7 @@ bool screenInitialise()
 			pie_SetShaderAvailability(true);
 		}
 	}
-	else if (canRunAtAll)
+	else if (canRunFallback)
 	{
 		// corner cases: vbo(core 1.5 or ARB ext), texture crossbar (core 1.4 or ARB ext)
 		debug(LOG_POPUP, _("OpenGL GLSL shader version 1.20 is not supported by your system. Some things may look wrong. Please upgrade your graphics driver/hardware, if possible."));