eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-06-05 23:10:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed memory leak at shutdown (thanks @1bsyl!)

Browse source 
Clean up the textures first, as destroying the current render target will queue viewport and clip rectangle commands
This commit is contained in:
Sam Lantinga 2023-02-05 08:35:40 -08:00
parent 5d1006657a
commit ec1b42557f
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/render/SDL_render.c
View file

@ -2134,7 +2134,6 @@ static int UpdateLogicalPresentation(SDL_Renderer *renderer)
} }
if (logical_w != existing_w || logical_h != existing_h) { if (logical_w != existing_w || logical_h != existing_h) {
SDL_DestroyTexture(renderer->logical_target); SDL_DestroyTexture(renderer->logical_target);
renderer->logical_target = NULL;
} }
} }
if (!renderer->logical_target) { if (!renderer->logical_target) {
@ -2242,7 +2241,6 @@ int SDL_SetRenderLogicalPresentation(SDL_Renderer *renderer, int w, int h, SDL_R
if (mode == SDL_LOGICAL_PRESENTATION_DISABLED) { if (mode == SDL_LOGICAL_PRESENTATION_DISABLED) {
if (renderer->logical_target) { if (renderer->logical_target) {
SDL_DestroyTexture(renderer->logical_target); SDL_DestroyTexture(renderer->logical_target);
renderer->logical_target = NULL;
} }
} else if (mode != SDL_LOGICAL_PRESENTATION_MATCH) { } else if (mode != SDL_LOGICAL_PRESENTATION_MATCH) {
if (renderer->logical_target) { if (renderer->logical_target) {
@ -2253,7 +2251,6 @@ int SDL_SetRenderLogicalPresentation(SDL_Renderer *renderer, int w, int h, SDL_R
} }
if (w != existing_w || h != existing_h) { if (w != existing_w || h != existing_h) {
SDL_DestroyTexture(renderer->logical_target); SDL_DestroyTexture(renderer->logical_target);
renderer->logical_target = NULL;
} }
} }
if (!renderer->logical_target) { if (!renderer->logical_target) {
@ -4052,6 +4049,11 @@ void SDL_DestroyTexture(SDL_Texture *texture)
FlushRenderCommandsIfTextureNeeded(texture); FlushRenderCommandsIfTextureNeeded(texture);
} }
if (texture == renderer->logical_target) {
renderer->logical_target = NULL;
renderer->logical_presentation_mode = SDL_LOGICAL_PRESENTATION_DISABLED;
}
texture->magic = NULL; texture->magic = NULL;
if (texture->next) { if (texture->next) {
@ -4089,6 +4091,17 @@ void SDL_DestroyRenderer(SDL_Renderer *renderer)
SDL_DelEventWatch(SDL_RendererEventWatch, renderer); SDL_DelEventWatch(SDL_RendererEventWatch, renderer);
/* Make sure all rendering has been flushed */
FlushRenderCommands(renderer);
/* Free existing textures for this renderer */
while (renderer->textures) {
SDL_Texture *tex = renderer->textures;
(void)tex;
SDL_DestroyTexture(renderer->textures);
SDL_assert(tex != renderer->textures); /* satisfy static analysis. */
}
if (renderer->render_commands_tail != NULL) { if (renderer->render_commands_tail != NULL) {
renderer->render_commands_tail->next = renderer->render_commands_pool; renderer->render_commands_tail->next = renderer->render_commands_pool;
cmd = renderer->render_commands; cmd = renderer->render_commands;
@ -4108,14 +4121,6 @@ void SDL_DestroyRenderer(SDL_Renderer *renderer)
SDL_free(renderer->vertex_data); SDL_free(renderer->vertex_data);
/* Free existing textures for this renderer */
while (renderer->textures) {
SDL_Texture *tex = renderer->textures;
(void)tex;
SDL_DestroyTexture(renderer->textures);
SDL_assert(tex != renderer->textures); /* satisfy static analysis. */
}
if (renderer->window) { if (renderer->window) {
SDL_SetWindowData(renderer->window, SDL_WINDOWRENDERDATA, NULL); SDL_SetWindowData(renderer->window, SDL_WINDOWRENDERDATA, NULL);
} }