libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 16:03:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Remove resetGraphicsScale from OSystem

Browse Source 
This function used to be called from the Engine class, but was
not longer used since commit 432fd522. The single remaining use
was an internal use in the SurfaceSdlGraphicsManager, and I kept
the behaviour there while removing the function.
This commit is contained in:
Thierry Crozat 2020-11-10 00:42:54 +00:00
parent 2d1a86f607
commit a509afdf4d
8 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backends/graphics/graphics.h
View File

@ -48,7 +48,6 @@ public:
};
virtual int getDefaultGraphicsMode() const { return 0; }
virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) { return (mode == 0); }
virtual void resetGraphicsScale() {}
virtual int getGraphicsMode() const { return 0; }
virtual const OSystem::GraphicsMode *getSupportedShaders() const {
static const OSystem::GraphicsMode no_shader[2] = {{"NONE", "Normal (no shader)", 0}, {0, 0, 0}};

6
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View File

@ -285,10 +285,6 @@ int SurfaceSdlGraphicsManager::getDefaultGraphicsMode() const {
#endif
}
void SurfaceSdlGraphicsManager::resetGraphicsScale() {
setGraphicsMode(s_gfxModeSwitchTable[_scalerType][0]);
}
void SurfaceSdlGraphicsManager::beginGFXTransaction() {
assert(_transactionMode == kTransactionNone);
@ -811,7 +807,7 @@ void SurfaceSdlGraphicsManager::initSize(uint w, uint h, const Graphics::PixelFo
if ((int)w != _videoMode.screenWidth || (int)h != _videoMode.screenHeight) {
const bool useDefault = defaultGraphicsModeConfig();
if (useDefault && w > 320) {
resetGraphicsScale();
setGraphicsMode(s_gfxModeSwitchTable[_scalerType][0]);
} else {
setGraphicsMode(getGraphicsModeIdByName(ConfMan.get("gfx_mode")));
}

1
backends/graphics/surfacesdl/surfacesdl-graphics.h
View File

@ -83,7 +83,6 @@ public:
virtual int getDefaultGraphicsMode() const override;
virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
virtual int getGraphicsMode() const override;
virtual void resetGraphicsScale() override;
#ifdef USE_RGB_COLOR
virtual Graphics::PixelFormat getScreenFormat() const override { return _screenFormat; }
virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override;

4
backends/modular-backend.cpp
View File

@ -109,10 +109,6 @@ int ModularGraphicsBackend::getStretchMode() const {
return _graphicsManager->getStretchMode();
}
void ModularGraphicsBackend::resetGraphicsScale() {
_graphicsManager->resetGraphicsScale();
}
#ifdef USE_RGB_COLOR
Graphics::PixelFormat ModularGraphicsBackend::getScreenFormat() const {

1
backends/modular-backend.h
View File

@ -76,7 +76,6 @@ public:
virtual int getDefaultStretchMode() const override final;
virtual bool setStretchMode(int mode) override final;
virtual int getStretchMode() const override final;
virtual void resetGraphicsScale() override final;
#ifdef USE_RGB_COLOR
virtual Graphics::PixelFormat getScreenFormat() const override final;
virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override final;

3
backends/platform/android3d/graphics.cpp
View File

@ -252,9 +252,6 @@ bool AndroidGraphicsManager::setGraphicsMode(int mode, uint flags) {
return true;
}
void AndroidGraphicsManager::resetGraphicsScale() {
}
int AndroidGraphicsManager::getGraphicsMode() const {
return _graphicsMode;
}

1
backends/platform/android3d/graphics.h
View File

@ -48,7 +48,6 @@ public:
virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
virtual int getDefaultGraphicsMode() const override;
virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;
virtual void resetGraphicsScale() override;
virtual int getGraphicsMode() const override;
virtual bool hasFeature(OSystem::Feature f) const override;

7
common/system.h
View File

@ -637,13 +637,6 @@ public:
*/
virtual int getGraphicsMode() const { return 0; }
/**
* Sets the graphics scale factor to x1. Games with large screen sizes
* reset the scale to x1 so the screen will not be too big when starting
* the game.
*/
virtual void resetGraphicsScale() {}
#ifdef USE_RGB_COLOR
/**
* Determine the pixel format currently in use for screen rendering.