diff options
| author | Cameron Cawley | 2019-07-26 19:17:57 +0100 |
|---|---|---|
| committer | Filippos Karapetis | 2019-08-11 14:27:52 +0300 |
| commit | 9b6461122e237a02a9cab6e7ee7a11b236f5d69f (patch) | |
| tree | d2ace55ae9f8872a9af926210c019a6e0d1bc86c /backends/graphics/gph | |
| parent | 6b8869fc64c32054a026fe0aa9d03fff6f53e310 (diff) | |
| download | scummvm-rg350-9b6461122e237a02a9cab6e7ee7a11b236f5d69f.tar.gz scummvm-rg350-9b6461122e237a02a9cab6e7ee7a11b236f5d69f.tar.bz2 scummvm-rg350-9b6461122e237a02a9cab6e7ee7a11b236f5d69f.zip | |
SDL: Move selecting the required ScalerProc into a separate function
Diffstat (limited to 'backends/graphics/gph')
| -rw-r--r-- | backends/graphics/gph/gph-graphics.cpp | 19 | ||||
| -rw-r--r-- | backends/graphics/gph/gph-graphics.h | 2 |
2 files changed, 3 insertions, 18 deletions
diff --git a/backends/graphics/gph/gph-graphics.cpp b/backends/graphics/gph/gph-graphics.cpp index efadc3ec37..a55a8869bb 100644 --- a/backends/graphics/gph/gph-graphics.cpp +++ b/backends/graphics/gph/gph-graphics.cpp @@ -61,10 +61,8 @@ int GPHGraphicsManager::getGraphicsModeScale(int mode) const { return scale; } -void GPHGraphicsManager::setGraphicsModeIntern() { - Common::StackLock lock(_graphicsMutex); +ScalerProc *GPHGraphicsManager::getGraphicsScalerProc(int mode) const { ScalerProc *newScalerProc = 0; - switch (_videoMode.mode) { case GFX_NORMAL: newScalerProc = Normal1x; @@ -72,22 +70,9 @@ void GPHGraphicsManager::setGraphicsModeIntern() { case GFX_HALF: newScalerProc = DownscaleAllByHalf; break; - - default: - error("Unknown gfx mode %d", _videoMode.mode); } - _scalerProc = newScalerProc; - - if (!_screen || !_hwScreen) - return; - - // Blit everything to the screen - _forceRedraw = true; - - // Even if the old and new scale factors are the same, we may have a - // different scaler for the cursor now. - blitCursor(); + return newScalerProc; } void GPHGraphicsManager::initSize(uint w, uint h, const Graphics::PixelFormat *format) { diff --git a/backends/graphics/gph/gph-graphics.h b/backends/graphics/gph/gph-graphics.h index 77da75c6aa..016b9b3b7b 100644 --- a/backends/graphics/gph/gph-graphics.h +++ b/backends/graphics/gph/gph-graphics.h @@ -43,7 +43,7 @@ public: void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL) override; const OSystem::GraphicsMode *getSupportedGraphicsModes() const override; int getGraphicsModeScale(int mode) const override; - void setGraphicsModeIntern() override; + ScalerProc *getGraphicsScalerProc(int mode) const override; void internUpdateScreen() override; void showOverlay() override; void hideOverlay() override; |