aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2011-03-17 19:53:19 +0100
committerJohannes Schickel2011-03-17 19:55:06 +0100
commit758aa78acc129c78942246df0e6425f03f2fa968 (patch)
tree0b841cf7eaf8050aa1d884c0e99c08b2d3b67c3c
parent96979f73fc10679fc0112cfbc55d6b661d744b05 (diff)
downloadscummvm-rg350-758aa78acc129c78942246df0e6425f03f2fa968.tar.gz
scummvm-rg350-758aa78acc129c78942246df0e6425f03f2fa968.tar.bz2
scummvm-rg350-758aa78acc129c78942246df0e6425f03f2fa968.zip
OPENGL: Get rid of _aspectRatioCorrection.
-rw-r--r--backends/graphics/opengl/opengl-graphics.cpp9
-rw-r--r--backends/graphics/opengl/opengl-graphics.h2
2 files changed, 4 insertions, 7 deletions
diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 5d23405eee..468c40a970 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -53,8 +53,7 @@ OpenGLGraphicsManager::OpenGLGraphicsManager()
_cursorVisible(false), _cursorKeyColor(0),
_cursorTargetScale(1),
_formatBGR(false),
- _displayX(0), _displayY(0), _displayWidth(0), _displayHeight(0),
- _aspectRatioCorrection(false) {
+ _displayX(0), _displayY(0), _displayWidth(0), _displayHeight(0) {
memset(&_oldVideoMode, 0, sizeof(_oldVideoMode));
memset(&_videoMode, 0, sizeof(_videoMode));
@@ -103,10 +102,11 @@ void OpenGLGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
// TODO: If we enable aspect ratio correction, we automatically set
// the video mode to 4/3. That is quity messy, but since we have that
// messy OpenGL mode use there's not much to do about it right now...
+ // Of course in case we disasble the aspect ratio correction, we
+ // might want to setup a different mode, but which one?
// Think of a way to get rid of this mess.
if (enable)
_videoMode.mode = OpenGL::GFX_4_3;
- _aspectRatioCorrection = enable;
break;
default:
break;
@@ -116,7 +116,7 @@ void OpenGLGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
bool OpenGLGraphicsManager::getFeatureState(OSystem::Feature f) {
switch (f) {
case OSystem::kFeatureAspectRatioCorrection:
- return _aspectRatioCorrection || (_videoMode.mode == OpenGL::GFX_4_3);
+ return _videoMode.mode == OpenGL::GFX_4_3;
default:
return false;
}
@@ -1365,7 +1365,6 @@ void OpenGLGraphicsManager::switchDisplayMode(int mode) {
_videoMode.mode = mode;
_transactionDetails.needRefresh = true;
- _aspectRatioCorrection = false;
}
}
diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index 3eeb52fcc0..3518d07fe7 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -217,8 +217,6 @@ protected:
*/
virtual uint getAspectRatio();
- bool _aspectRatioCorrection;
-
bool _formatBGR;
//