libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-19 10:41:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDL: Don't try to draw the SubScreen if it's null

Browse Source 
Also simplify the closeOverlay method. This has the side effect of properly freeing
SubScreen when building without OpenGL.
This commit is contained in:
Bastien Bouclet 2016-06-11 13:32:04 +02:00
parent 0362ac0dbc
commit 87ceda2324
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -685,12 +685,15 @@ void SurfaceSdlGraphicsManager::updateScreen() {
} else
#endif
{
SDL_Rect dstrect;
dstrect.x = _gameRect.getTopLeft().getX();
dstrect.y = _gameRect.getTopLeft().getY();
dstrect.w = _gameRect.getWidth();
dstrect.h = _gameRect.getHeight();
SDL_BlitSurface(_subScreen, NULL, _screen, &dstrect);
if (_subScreen) {
SDL_Rect dstrect;
dstrect.x = _gameRect.getTopLeft().getX();
dstrect.y = _gameRect.getTopLeft().getY();
dstrect.w = _gameRect.getWidth();
dstrect.h = _gameRect.getHeight();
SDL_BlitSurface(_subScreen, NULL, _screen, &dstrect);
}
if (_overlayVisible) {
drawOverlay();
}
@ -945,29 +948,27 @@ void SurfaceSdlGraphicsManager::closeOverlay() {
#endif
if (_overlayscreen) {
SDL_FreeSurface(_overlayscreen);
_overlayscreen = NULL;
#ifdef USE_OPENGL
delete _surfaceRenderer;
_surfaceRenderer = nullptr;
if (_opengl) {
for (uint i = 0; i < _overlayTextures.size(); i++) {
delete _overlayTextures[i];
}
_overlayTextures.clear();
if (_frameBuffer) {
delete _frameBuffer;
_frameBuffer = nullptr;
}
} else if (_subScreen) {
SDL_FreeSurface(_subScreen);
_subScreen = nullptr;
}
OpenGL::Context::destroy();
#endif
_overlayscreen = nullptr;
}
if (_subScreen) {
SDL_FreeSurface(_subScreen);
_subScreen = nullptr;
}
#ifdef USE_OPENGL
delete _surfaceRenderer;
_surfaceRenderer = nullptr;
for (uint i = 0; i < _overlayTextures.size(); i++) {
delete _overlayTextures[i];
}
_overlayTextures.clear();
delete _frameBuffer;
_frameBuffer = nullptr;
OpenGL::Context::destroy();
#endif
}
#pragma mark -