[Scummvm-git-logs] scummvm master -> f94c56f100f85868dd377fb83c19ebc86cf2fdd6

[lolbot-iichan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f94c56f100 TESTBED: Don't fail when pixel format couldn't be set


Commit: f94c56f100f85868dd377fb83c19ebc86cf2fdd6
    https://github.com/scummvm/scummvm/commit/f94c56f100f85868dd377fb83c19ebc86cf2fdd6
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-07-05T23:19:51+03:00

Commit Message:
TESTBED: Don't fail when pixel format couldn't be set

When pixel format isn't supported an assertion can be raised during
blitting. Don't draw anything instead.

Changed paths:
    engines/testbed/graphics.cpp


diff --git a/engines/testbed/graphics.cpp b/engines/testbed/graphics.cpp
index 6545af510b..1d598e82e9 100644
--- a/engines/testbed/graphics.cpp
+++ b/engines/testbed/graphics.cpp
@@ -1398,7 +1398,11 @@ void GFXtests::showPixelFormat(const Graphics::PixelFormat &pf, uint aLoss) {
 
 	g_system->beginGFXTransaction();
 		g_system->initSize(320, 200, &pf);
-	g_system->endGFXTransaction();
+	OSystem::TransactionError gfxError = g_system->endGFXTransaction();
+	if (gfxError) {
+		Testsuite::logPrintf("WARNING! Pixel Format %s is unsupported\n", pf.toString().c_str());
+		return;
+	}
 	Testsuite::clearScreen(true);
 
 	Graphics::Surface *screen = g_system->lockScreen();