← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands

 

GunChleoc has proposed merging lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands.

Commit message:
Print the shading language as double to console

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/shading_language_too_old/+merge/356681

Some additional log output to try to track down the bug reported in https://wl.widelands.org/forum/topic/4237/?page=2#post-26398
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands.
=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc	2018-10-09 20:18:52 +0000
+++ src/graphic/gl/initialize.cc	2018-10-14 08:20:15 +0000
@@ -192,10 +192,12 @@
 		exit(1);
 	}
 
-	log("Graphics: OpenGL: ShadingLanguage: \"%s\"\n", shading_language_version_string);
+	log("Graphics: OpenGL: ShadingLanguage: \"%s\"", shading_language_version_string);
 
 	// Exit if the shading language version is too old
 	const double shading_language_version = atof(shading_language_version_string);
+	log(" (%.2f)\n", shading_language_version);
+
 	if (shading_language_version < 1.20) {
 		log("ERROR: Shading language version is too old!\n");
 		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",


Follow ups