Merge lp:~widelands-dev/widelands/bug-1817686-SDL-pixel-format into lp:widelands

[GunChleoc]

Fail with SDL messagebox if SDL_BYTESPERPIXEL != 4

[Benedikt Straub (nordfriese)]

Tested it.
The log says »ERROR: Wrong SDL_BYTESPERPIXEL, expected 4 but got 1« as expected.
But no message box appears, the program exits immediately.

By the way, the assert could be removed now, right? Since the triggering failure is now caught beforehand.

[GunChleoc (gunchleoc)]

I guess the driver is too messed up to even display the message box then. I have now made the log message identical to the dialog message and removed the assert.

[Benedikt Straub (nordfriese)]

It´s a perfectly normal built-in Intel graphics card (VGA compatible controller, Atom Processor Z36xxx/Z37xxx Series Graphics & Display) with default drivers – no reason why it should behave like that, especially in such a random way. It always worked before…

The code looks good to me; and if the SDL is messed up, that´s a problem with the graphics driver or possibly the SDL, but not in widelands.

review: Approve

[GunChleoc (gunchleoc)]

Thanks for the review and testing

@bunnybot merge

[kaputtnik (franku)]

> built-in Intel graphics card

I should had bet for this :-D There were several problems with this graphics card in the past.

Glad it's working for you now.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4535. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/499382080.
Appveyor build 4322. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1817686_SDL_pixel_format-4322.

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4535. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/499382080.

[hessenfarmer (stephan-lutz)]

travis failure is transient. (apt-get failed)

@bunnybot merge force

=== modified file 'src/graphic/graphic.cc'
--- src/graphic/graphic.cc	2019-02-23 11:00:49 +0000
+++ src/graphic/graphic.cc	2019-02-27 16:20:48 +0000
@@ -114,7 +114,16 @@
 		    " size %d %d\n"
 		    "**** END GRAPHICS REPORT ****\n",
 		    SDL_GetCurrentVideoDriver(), disp_mode.format, disp_mode.w, disp_mode.h);
-		assert(SDL_BYTESPERPIXEL(disp_mode.format) == 4);
+		const int bytes_per_pixel = SDL_BYTESPERPIXEL(disp_mode.format);
+		if (bytes_per_pixel != 4) {
+			const std::string error_message = (boost::format("SDL should report 4 bytes per pixel, but %d were reported instead.\nPlease check that everything's OK with your graphics driver.") % bytes_per_pixel).str();
+			log("ERROR: %s\n", error_message.c_str());
+			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Video Error",
+			                         error_message.c_str(),
+			                         nullptr);
+			exit(1);
+
+		}
 	}
 
 	std::map<std::string, std::unique_ptr<Texture>> textures_in_atlas;