thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: Split ScalerPluginObject into two classes

Browse source
This commit is contained in:
Cameron Cawley 2021-11-22 00:01:20 +00:00 • committed by Eugene Sandulenko
parent 6547ecf673
commit a21961516a
29 changed files with 452 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backends/graphics/opengl/opengl-graphics.cpp
View file

@ -319,7 +319,7 @@ bool OpenGLGraphicsManager::setScaler(uint mode, int factor) {
else if (_scalerPlugins[mode]->get<ScalerPluginObject>().hasFactor(_oldState.scaleFactor))
newFactor = _oldState.scaleFactor;
else
newFactor = _scalerPlugins[mode]->get<ScalerPluginObject>().getFactor();
newFactor = _scalerPlugins[mode]->get<ScalerPluginObject>().getDefaultFactor();
_currentState.scalerIndex = mode;
_currentState.scaleFactor = newFactor;
@ -330,6 +330,10 @@ bool OpenGLGraphicsManager::setScaler(uint mode, int factor) {
uint OpenGLGraphicsManager::getScaler() const {
return _currentState.scalerIndex;
}
uint OpenGLGraphicsManager::getScaleFactor() const {
return _currentState.scaleFactor;
}
#endif
void OpenGLGraphicsManager::beginGFXTransaction() {
@ -445,8 +449,6 @@ OSystem::TransactionError OpenGLGraphicsManager::endGFXTransaction() {
} while (_transactionMode == kTransactionRollback);
if (setupNewGameScreen) {
if (_gameScreen)
_gameScreen->unloadScaler();
delete _gameScreen;
_gameScreen = nullptr;