Skip to content

video: unify screen-surface teardown into one helper #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ForkedInTime wants to merge 1 commit into
base: alpha
Choose a base branch
from
Open

video: unify screen-surface teardown into one helper #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 34 additions & 36 deletions src/bflib_video.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,39 +542,53 @@ TbResult LbScreenInitialize(void)
return Lb_SUCCESS;
}

/** Set up the window, render surface, etc. Called when we want to change the screen setup. Uses SDL2. */
TbResult LbScreenSetup(TbScreenMode mode, TbScreenCoord width, TbScreenCoord height,
unsigned char *palette, short buffers_count, TbBool wscreen_vid)
/** Release the draw/second surface (and the GL present backend, if active) and
* clear all associated screen-surface state. Shared by LbScreenSetup (before
* re-creating the surfaces for a new mode) and LbScreenReset (on teardown), so
* the two paths cannot drift apart.
*
* In GL-present mode lbScreenSurface and lbDrawSurface alias the SAME surface
* we own, so BOTH pointers must be cleared here — otherwise lbScreenSurface is
* left dangling at the just-freed surface. In the CPU path lbScreenSurface is
* the SDL-owned window surface, which we must NOT free; dropping our reference
* is correct (SDL frees it on the next mode set or on SDL_Quit). */
static void lb_release_screen_surfaces(void)
{
int32_t hot_x;
int32_t hot_y;
const struct TbSprite* msspr = NULL;
LbExeReferenceNumber();
if (lbDisplay.MouseSprite != NULL)
{
msspr = lbDisplay.MouseSprite;
GetPointerHotspot(&hot_x,&hot_y);
}
SDL_Surface* prevScreenSurf = lbScreenSurface;
LbMouseChangeSprite(NULL);

TbBool freed_draw_surface = false;
#ifndef _WIN32
if (lbUseGLPresent) {
// Tear down the old GL backend before re-creating it for the new mode.
gl_present_shutdown();
// In GL mode lbDrawSurface is an allocated 8-bit surface we own.
SDL_FreeSurface(lbDrawSurface);
lbUseGLPresent = false;
} else
freed_draw_surface = true;
}
#endif
if (lbHasSecondSurface) {
if (!freed_draw_surface && lbHasSecondSurface) {
SDL_FreeSurface(lbDrawSurface);
}
lbHasSecondSurface = false;
lbDrawSurface = NULL;
lbScreenSurface = NULL;
lbScreenInitialised = false;
}

if (prevScreenSurf != NULL) {
/** Set up the window, render surface, etc. Called when we want to change the screen setup. Uses SDL2. */
TbResult LbScreenSetup(TbScreenMode mode, TbScreenCoord width, TbScreenCoord height,
unsigned char *palette, short buffers_count, TbBool wscreen_vid)
{
int32_t hot_x;
int32_t hot_y;
const struct TbSprite* msspr = NULL;
LbExeReferenceNumber();
if (lbDisplay.MouseSprite != NULL)
{
msspr = lbDisplay.MouseSprite;
GetPointerHotspot(&hot_x,&hot_y);
}
LbMouseChangeSprite(NULL);
// Tear down the old surfaces / GL backend before re-creating them for the new mode.
lb_release_screen_surfaces();

TbScreenModeInfo* mdinfo = LbScreenGetModeInfo(mode); // The desired mode has already been checked
// Note:
Expand Down Expand Up @@ -849,23 +863,7 @@ TbResult LbScreenReset(TbBool exiting_application)
if (!lbScreenInitialised)
return Lb_FAIL;
LbMouseChangeSprite(NULL);
#ifndef _WIN32
if (lbUseGLPresent) {
gl_present_shutdown();
// In GL mode lbDrawSurface is an allocated 8-bit surface we own.
SDL_FreeSurface(lbDrawSurface);
lbUseGLPresent = false;
} else
#endif
if (lbHasSecondSurface) {
SDL_FreeSurface(lbDrawSurface);
}
//do not free screen surface, it is freed automatically on SDL_Quit or next call to set video mode
lbHasSecondSurface = false;
lbDrawSurface = NULL;
lbScreenSurface = NULL;
// Mark as not initialized
lbScreenInitialised = false;
lb_release_screen_surfaces();
if (exiting_application)
{
// we get here when we are actually closing the application
Expand Down