aboutsummaryrefslogtreecommitdiff
path: root/backends/graphics
diff options
context:
space:
mode:
authorJohannes Schickel2011-03-17 18:15:50 +0100
committerJohannes Schickel2011-03-17 18:35:32 +0100
commit3c656916f169e0428bd62c390a8ccb7b7dbd150f (patch)
treec5f5b43539109fbde2e8045303b3eb0bba068eb2 /backends/graphics
parent019aa63b1580a2b629f45aa436cae47b0b330794 (diff)
downloadscummvm-rg350-3c656916f169e0428bd62c390a8ccb7b7dbd150f.tar.gz
scummvm-rg350-3c656916f169e0428bd62c390a8ccb7b7dbd150f.tar.bz2
scummvm-rg350-3c656916f169e0428bd62c390a8ccb7b7dbd150f.zip
OPENGL: Always properly set the overlay dimensions in loadGFXMode.
Diffstat (limited to 'backends/graphics')
-rw-r--r--backends/graphics/openglsdl/openglsdl-graphics.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index 0c7e53950c..b68b55fef1 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -314,14 +314,6 @@ bool OpenGLSdlGraphicsManager::loadGFXMode() {
_videoMode.hardwareHeight = (_videoMode.overlayWidth * 10000 + 5000) / desiredAspectRatio;
else if (screenAspectRatio < desiredAspectRatio)
_videoMode.hardwareWidth = (_videoMode.overlayHeight * desiredAspectRatio + 5000) / 10000;
-
- // Only adjust the overlay height if it is bigger than original one. If
- // the width is modified it can break the overlay.
- if (_videoMode.hardwareHeight > _videoMode.overlayHeight)
- _videoMode.overlayHeight = _videoMode.hardwareHeight;
- } else {
- _videoMode.overlayWidth = _videoMode.hardwareWidth;
- _videoMode.overlayHeight = _videoMode.hardwareHeight;
}
_screenResized = false;
@@ -337,11 +329,11 @@ bool OpenGLSdlGraphicsManager::loadGFXMode() {
if (!setupFullscreenMode())
// Failed setuping a fullscreen mode
return false;
-
- _videoMode.overlayWidth = _videoMode.hardwareWidth;
- _videoMode.overlayHeight = _videoMode.hardwareHeight;
}
+ _videoMode.overlayWidth = _videoMode.hardwareWidth;
+ _videoMode.overlayHeight = _videoMode.hardwareHeight;
+
uint32 flags = SDL_OPENGL;
if (_videoMode.fullscreen)