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

Proposed by GunChleoc
Status: Merged
Merged at revision: 8882
Proposed branch: lp:~widelands-dev/widelands/shading_language_too_old
Merge into: lp:widelands
Diff against target: 17 lines (+3/-1)
1 file modified
src/graphic/gl/initialize.cc (+3/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/shading_language_too_old
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+356681@code.launchpad.net

Commit message

Print the shading language as double to console

Description of the change

Some additional log output to try to track down the bug reported in https://wl.widelands.org/forum/topic/4237/?page=2#post-26398

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

We need this for debugging, so I'll merge it straight away.

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4128. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/441213282.
Appveyor build 3925. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_shading_language_too_old-3925.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/graphic/gl/initialize.cc'
2--- src/graphic/gl/initialize.cc 2018-10-09 20:18:52 +0000
3+++ src/graphic/gl/initialize.cc 2018-10-14 08:20:15 +0000
4@@ -192,10 +192,12 @@
5 exit(1);
6 }
7
8- log("Graphics: OpenGL: ShadingLanguage: \"%s\"\n", shading_language_version_string);
9+ log("Graphics: OpenGL: ShadingLanguage: \"%s\"", shading_language_version_string);
10
11 // Exit if the shading language version is too old
12 const double shading_language_version = atof(shading_language_version_string);
13+ log(" (%.2f)\n", shading_language_version);
14+
15 if (shading_language_version < 1.20) {
16 log("ERROR: Shading language version is too old!\n");
17 SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",

Subscribers

People subscribed via source and target branches

to status/vote changes: