[Scummvm-git-logs] scummvm master -> d93fe85994c9ada46e1d7e03db4de692ba799047
criezy
criezy at scummvm.org
Sun Jul 8 23:20:31 CEST 2018
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:
d93fe85994 BACKENDS: Fix compilation with SDL 1.2
Commit: d93fe85994c9ada46e1d7e03db4de692ba799047
https://github.com/scummvm/scummvm/commit/d93fe85994c9ada46e1d7e03db4de692ba799047
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-07-08T22:20:28+01:00
Commit Message:
BACKENDS: Fix compilation with SDL 1.2
Changed paths:
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 1ca8902..ac758e4 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -335,9 +335,9 @@ void SurfaceSdlGraphicsManager::beginGFXTransaction() {
_transactionDetails.needHotswap = false;
_transactionDetails.needUpdatescreen = false;
- _transactionDetails.needDisplayResize = false;
#if SDL_VERSION_ATLEAST(2, 0, 0)
+ _transactionDetails.needDisplayResize = false;
_transactionDetails.needTextureUpdate = false;
#endif
#ifdef USE_RGB_COLOR
@@ -448,8 +448,10 @@ OSystem::TransactionError SurfaceSdlGraphicsManager::endGFXTransaction() {
// To fix this issue we update the screen change count right here.
_screenChangeCount++;
+#if SDL_VERSION_ATLEAST(2, 0, 0)
if (_transactionDetails.needDisplayResize)
recalculateDisplayAreas();
+#endif
if (_transactionDetails.needUpdatescreen)
internUpdateScreen();
}
@@ -463,8 +465,10 @@ OSystem::TransactionError SurfaceSdlGraphicsManager::endGFXTransaction() {
#endif
} else if (_transactionDetails.needUpdatescreen) {
setGraphicsModeIntern();
+#if SDL_VERSION_ATLEAST(2, 0, 0)
if (_transactionDetails.needDisplayResize)
recalculateDisplayAreas();
+#endif
internUpdateScreen();
}
More information about the Scummvm-git-logs
mailing list