aboutsummaryrefslogtreecommitdiff
path: root/backends/graphics
diff options
context:
space:
mode:
authorDavid-John Willis2011-10-03 12:24:25 +0100
committerDavid-John Willis2011-10-03 12:24:25 +0100
commit69683b8ee028c008bac6cde04a6e2e811501a3d0 (patch)
tree9273a5a35d42c24b942c512b483ae1e1a652dae0 /backends/graphics
parent5e8562d373c99e980ff64ceb1763b5e3b02ffdf1 (diff)
downloadscummvm-rg350-69683b8ee028c008bac6cde04a6e2e811501a3d0.tar.gz
scummvm-rg350-69683b8ee028c008bac6cde04a6e2e811501a3d0.tar.bz2
scummvm-rg350-69683b8ee028c008bac6cde04a6e2e811501a3d0.zip
SURFACESDL: Stop forceful resetting of _videoMode.hardware* when calling SurfaceSdlGraphicsManager::loadGFXMode() for the GPH backend.
* Note: This really should be cleaned up and all backends that have a custom loadGFXMode() really should setup their own _videoMode.hardware* settings. Assuming the overlay will always match the hardware is flawed logic on devices with fixed hardware screens. * Just done for the GPH backend for now to cut down on the regresion risk to other backends near the 1.4.0 release cycle.
Diffstat (limited to 'backends/graphics')
-rw-r--r--backends/graphics/surfacesdl/surfacesdl-graphics.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 146200148a..f3a1cad040 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -731,7 +731,8 @@ bool SurfaceSdlGraphicsManager::loadGFXMode() {
_videoMode.hardwareWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
_videoMode.hardwareHeight = effectiveScreenHeight();
-#else
+// On GPH devices ALL the _videoMode.hardware... are setup in GPHGraphicsManager::loadGFXMode()
+#elif !defined(GPH_DEVICE)
_videoMode.hardwareWidth = _videoMode.overlayWidth;
_videoMode.hardwareHeight = _videoMode.overlayHeight;
#endif