From 69683b8ee028c008bac6cde04a6e2e811501a3d0 Mon Sep 17 00:00:00 2001
From: David-John Willis
Date: Mon, 3 Oct 2011 12:24:25 +0100
Subject: 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.
---
 backends/graphics/surfacesdl/surfacesdl-graphics.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'backends/graphics')

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
-- 
cgit v1.2.3