mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-20 10:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11188 from Jamiras/cheevos_texture_cleanup

Browse Source 
(cheevos) ensure badge textures are released before video driver is deinitialized
This commit is contained in:
Autechre 2020-08-13 17:22:29 +02:00 committed by GitHub
commit c18850456d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cheevos/cheevos.c
View File

@ -1311,6 +1311,9 @@ bool rcheevos_unload(void)
CHEEVOS_FREE(rcheevos_locals.richpresence.richpresence);
rcheevos_free_patchdata(&rcheevos_locals.patchdata);
rcheevos_memory_destroy(&rcheevos_locals.memory);
#ifdef HAVE_MENU
cheevos_reset_menu_badges();
#endif
rcheevos_locals.core = NULL;
rcheevos_locals.unofficial = NULL;

20
gfx/widgets/gfx_widget_achievement_popup.c
View File

@ -75,10 +75,8 @@ static bool gfx_widget_achievement_popup_init(bool video_is_threaded, bool fulls
return true;
}
static void gfx_widget_achievement_popup_free(void)
static void gfx_widget_achievement_popup_free_all(gfx_widget_achievement_popup_state_t* state)
{
gfx_widget_achievement_popup_state_t* state = gfx_widget_achievement_popup_get_ptr();
if (state->queue_read_index >= 0)
{
SLOCK_LOCK(state->queue_lock);
@ -88,6 +86,13 @@ static void gfx_widget_achievement_popup_free(void)
SLOCK_UNLOCK(state->queue_lock);
}
}
static void gfx_widget_achievement_popup_free(void)
{
gfx_widget_achievement_popup_state_t* state = gfx_widget_achievement_popup_get_ptr();
gfx_widget_achievement_popup_free_all(state);
#ifdef HAVE_THREADS
slock_free(state->queue_lock);
@ -95,6 +100,13 @@ static void gfx_widget_achievement_popup_free(void)
#endif
}
static void gfx_widget_achievement_popup_context_destroy(void)
{
gfx_widget_achievement_popup_state_t* state = gfx_widget_achievement_popup_get_ptr();
gfx_widget_achievement_popup_free_all(state);
}
static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
{
gfx_widget_achievement_popup_state_t* state = gfx_widget_achievement_popup_get_ptr();
@ -405,7 +417,7 @@ const gfx_widget_t gfx_widget_achievement_popup = {
&gfx_widget_achievement_popup_init,
&gfx_widget_achievement_popup_free,
NULL, /* context_reset*/
NULL, /* context_destroy */
&gfx_widget_achievement_popup_context_destroy,
NULL, /* layout */
NULL, /* iterate */
&gfx_widget_achievement_popup_frame