libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-08 20:07:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SURFACESDL: Allow vsync support to be implemented in subclasses with SDL 1.2

Browse Source
This commit is contained in:
Cameron Cawley 2023-02-19 14:53:23 +00:00
parent 182ce944a5
commit 971148c9bd
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,8 +179,8 @@ SurfaceSdlGraphicsManager::SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSou
_videoMode.filtering = ConfMan.getBool("filtering");
#if SDL_VERSION_ATLEAST(2, 0, 0)
_videoMode.stretchMode = STRETCH_FIT;
_videoMode.vsync = ConfMan.getBool("vsync");
#endif
_videoMode.vsync = ConfMan.getBool("vsync");
_videoMode.scalerIndex = getDefaultScaler();
_videoMode.scaleFactor = getDefaultScaleFactor();
@ -236,11 +236,9 @@ void SurfaceSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable)
case OSystem::kFeatureFilteringMode:
setFilteringMode(enable);
break;
#if SDL_VERSION_ATLEAST(2, 0, 0)
case OSystem::kFeatureVSync:
setVSync(enable);
break;
#endif
case OSystem::kFeatureCursorPalette:
_cursorPaletteDisabled = !enable;
blitCursor();
@ -267,10 +265,8 @@ bool SurfaceSdlGraphicsManager::getFeatureState(OSystem::Feature f) const {
case OSystem::kFeatureAspectRatioCorrection:
return _videoMode.aspectRatioCorrection;
#endif
#if SDL_VERSION_ATLEAST(2, 0, 0)
case OSystem::kFeatureVSync:
return _videoMode.vsync;
#endif
case OSystem::kFeatureFilteringMode:
return _videoMode.filtering;
case OSystem::kFeatureCursorPalette:
@ -348,13 +344,13 @@ OSystem::TransactionError SurfaceSdlGraphicsManager::endGFXTransaction() {
_videoMode.stretchMode = _oldVideoMode.stretchMode;
}
#endif
if (_videoMode.vsync != _oldVideoMode.vsync) {
errors |= OSystem::kTransactionVSyncFailed;
_videoMode.vsync = _oldVideoMode.vsync;
}
#endif
if (_videoMode.filtering != _oldVideoMode.filtering) {
errors |= OSystem::kTransactionFilteringFailed;
@ -1527,7 +1523,6 @@ void SurfaceSdlGraphicsManager::setFullscreenMode(bool enable) {
}
}
#if SDL_VERSION_ATLEAST(2, 0, 0)
void SurfaceSdlGraphicsManager::setVSync(bool enable) {
Common::StackLock lock(_graphicsMutex);
@ -1542,7 +1537,6 @@ void SurfaceSdlGraphicsManager::setVSync(bool enable) {
_transactionDetails.needHotswap = true;
}
}
#endif
void SurfaceSdlGraphicsManager::setAspectRatioCorrection(bool enable) {
Common::StackLock lock(_graphicsMutex);

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

@ -263,8 +263,8 @@ protected:
#if SDL_VERSION_ATLEAST(2, 0, 0)
int stretchMode;
bool vsync;
#endif
bool vsync;
uint scalerIndex;
int scaleFactor;
@ -285,8 +285,8 @@ protected:
#if SDL_VERSION_ATLEAST(2, 0, 0)
stretchMode = 0;
vsync = false;
#endif
vsync = false;
scalerIndex = 0;
scaleFactor = 0;
@ -428,9 +428,7 @@ protected:
virtual void setAspectRatioCorrection(bool enable);
void setFilteringMode(bool enable);
#if SDL_VERSION_ATLEAST(2, 0, 0)
void setVSync(bool enable);
#endif
bool saveScreenshot(const Common::String &filename) const override;
virtual void setGraphicsModeIntern();