Merge pull request #72 from bullno1/fix-glsl_test

Fix glsl_test for non-Apple platforms
aras-p · Oct 9, 2014 · 8828115 · 8828115
2 parents c0f043c + 716ab23
commit 8828115
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/tests/glsl_optimizer_tests.cpp b/tests/glsl_optimizer_tests.cpp
@@ -203,13 +203,14 @@ static bool CheckGLSL (bool vertex, bool gles, const std::string& testName, cons
 	if (source.find("#version 140") != std::string::npos)
 		return true;
 	#endif
+
+	const bool need3 =
+		(source.find("#version 150") != std::string::npos) ||
+		(source.find("#version 300") != std::string::npos);
 
 #	ifdef __APPLE__
 	// Mac core context does not accept any older shader versions, so need to switch to
 	// either legacy context or core one.
-	const bool need3 =
-		(source.find("#version 150") != std::string::npos) ||
-		(source.find("#version 300") != std::string::npos);
 	if (need3)
 	{
 		if (!s_GL3Active)