[Scummvm-git-logs] scummvm master -> 8f49df6acab508b3e2076eb003a999f7258734e5

[aquadran]

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:
8f49df6aca SDL: Fix full screen toggling for 3D games


Commit: 8f49df6acab508b3e2076eb003a999f7258734e5
    https://github.com/scummvm/scummvm/commit/8f49df6acab508b3e2076eb003a999f7258734e5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-09-29T20:24:03+02:00

Commit Message:
SDL: Fix full screen toggling for 3D games

The previous SdlGraphics3dManager::toggleFullScreen() was not using
beginGFXTransaction / endGFXTransaction in toggleFullScreen().
Restore this logic for 3D games, as using transactions in such games
results in a black screen for 3D games when switching to full screen

A regression from d33487f64

Changed paths:
    backends/graphics/sdl/sdl-graphics.cpp


diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp
index 8a55e63404..4f185e3474 100644
--- a/backends/graphics/sdl/sdl-graphics.cpp
+++ b/backends/graphics/sdl/sdl-graphics.cpp
@@ -401,9 +401,13 @@ void SdlGraphicsManager::toggleFullScreen() {
 		return;
 	}
 
-	beginGFXTransaction();
+	bool is3D = g_system->hasFeature(OSystem::kFeatureOpenGLForGame);
+
+	if (!is3D)
+		beginGFXTransaction();
 	setFeatureState(OSystem::kFeatureFullscreenMode, !getFeatureState(OSystem::kFeatureFullscreenMode));
-	endGFXTransaction();
+	if (!is3D)
+		endGFXTransaction();
 #ifdef USE_OSD
 	if (getFeatureState(OSystem::kFeatureFullscreenMode))
 		displayMessageOnOSD(_("Fullscreen mode"));