mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-02-09 01:39:01 +01:00
parent c3c408f9d6
commit cdf272665e
5 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/drivers/materialui.c
View File

@ -1085,8 +1085,8 @@ static void mui_context_bg_destroy(mui_handle_t *mui)
if (!mui)
return;
menu_display_texture_unload((uintptr_t*)&mui->textures.bg.id);
menu_display_texture_unload((uintptr_t*)&mui->textures.white);
video_driver_texture_unload((uintptr_t*)&mui->textures.bg.id);
video_driver_texture_unload((uintptr_t*)&mui->textures.white);
}
static void mui_context_destroy(void *data)
@ -1098,7 +1098,7 @@ static void mui_context_destroy(void *data)
return;
for (i = 0; i < MUI_TEXTURE_LAST; i++)
menu_display_texture_unload((uintptr_t*)&mui->textures.list[i].id);
video_driver_texture_unload((uintptr_t*)&mui->textures.list[i].id);
menu_display_ctl(MENU_DISPLAY_CTL_FONT_MAIN_DEINIT, NULL);

14
menu/drivers/xmb.c
View File

@ -1007,14 +1007,11 @@ static void xmb_context_destroy_horizontal_list(xmb_handle_t *xmb)
file_list_get_at_offset(xmb->horizontal_list, i,
&path, NULL, NULL, NULL);
if (!path)
if (!path || !strstr(path, ".lpl"))
continue;
if (!strstr(path, ".lpl"))
continue;
menu_display_texture_unload((uintptr_t*)&node->icon);
menu_display_texture_unload((uintptr_t*)&node->content_icon);
video_driver_texture_unload((uintptr_t*)&node->icon);
video_driver_texture_unload((uintptr_t*)&node->content_icon);
}
}
@ -2080,8 +2077,7 @@ static void xmb_context_bg_destroy(xmb_handle_t *xmb)
{
if (!xmb)
return;
menu_display_texture_unload((uintptr_t*)&xmb->textures.bg.id);
video_driver_texture_unload((uintptr_t*)&xmb->textures.bg.id);
}
static bool xmb_load_image(void *userdata, void *data, menu_image_type_t type)
@ -2561,7 +2557,7 @@ static void xmb_context_destroy(void *data)
return;
for (i = 0; i < XMB_TEXTURE_LAST; i++)
menu_display_texture_unload((uintptr_t*)&xmb->textures.list[i].id);
video_driver_texture_unload((uintptr_t*)&xmb->textures.list[i].id);
xmb_context_destroy_horizontal_list(xmb);
xmb_context_bg_destroy(xmb);

4
menu/drivers/zarch.c
View File

@ -1125,8 +1125,8 @@ static void zarch_context_bg_destroy(void *data)
zui_t *zui = (zui_t*)data;
if (!zui)
return;
menu_display_texture_unload((uintptr_t*)&zui->textures.bg.id);
menu_display_texture_unload((uintptr_t*)&zui->textures.white);
video_driver_texture_unload((uintptr_t*)&zui->textures.bg.id);
video_driver_texture_unload((uintptr_t*)&zui->textures.white);
}
static void zarch_context_destroy(void *data)

7
menu/menu_display.c
View File

@ -519,13 +519,6 @@ unsigned menu_display_texture_load(void *data,
return id;
}
void menu_display_texture_unload(uintptr_t *id)
{
if (!id)
return;
video_driver_texture_unload(id);
}
void menu_display_draw(float x, float y,
unsigned width, unsigned height,
struct gfx_coords *coords,

2
menu/menu_display.h
View File

@ -175,8 +175,6 @@ unsigned menu_display_texture_load(void *data,
void menu_display_clear_color(float r, float g, float b, float a);
void menu_display_texture_unload(uintptr_t *id);
void menu_display_handle_wallpaper_upload(void *task_data,
void *user_data, const char *err);