diff options
| author | Johannes Schickel | 2011-03-17 19:58:47 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-03-17 21:20:20 +0100 |
| commit | daf6050d7c5d625bff4516f86cbec205bbd51c80 (patch) | |
| tree | 37da288f21de8117898dab66a2e7f52c3d38b3fd | |
| parent | 0eb5352290ddfea9d90f99b97fa0d89c806d25e0 (diff) | |
| download | scummvm-rg350-daf6050d7c5d625bff4516f86cbec205bbd51c80.tar.gz scummvm-rg350-daf6050d7c5d625bff4516f86cbec205bbd51c80.tar.bz2 scummvm-rg350-daf6050d7c5d625bff4516f86cbec205bbd51c80.zip | |
OPENGL: Make setScale non-virtual.
| -rw-r--r-- | backends/graphics/opengl/opengl-graphics.cpp | 2 | ||||
| -rw-r--r-- | backends/graphics/opengl/opengl-graphics.h | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp index 468c40a970..915a686285 100644 --- a/backends/graphics/opengl/opengl-graphics.cpp +++ b/backends/graphics/opengl/opengl-graphics.cpp @@ -1219,6 +1219,8 @@ void OpenGLGraphicsManager::unloadGFXMode() { } void OpenGLGraphicsManager::setScale(int newScale) { + assert(_transactionMode == kTransactionActive); + if (newScale == _videoMode.scaleFactor) return; diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h index 3518d07fe7..976524e713 100644 --- a/backends/graphics/opengl/opengl-graphics.h +++ b/backends/graphics/opengl/opengl-graphics.h @@ -176,7 +176,14 @@ protected: virtual bool loadGFXMode(); virtual void unloadGFXMode(); - virtual void setScale(int newScale); + /** + * Set the scale factor. + * + * This can only be used in a GFX transaction. + * + * @param newScale New scale factor. + */ + void setScale(int newScale); /** * Query the scale factor. |