CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 18:58:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-05-19 15:31:14 +02:00
parent 59fb7700b8
commit cb2e898d8c
2 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
menu/menu_driver.c
View File

@ -320,38 +320,6 @@ bool menu_display_font_flush_block(unsigned width, unsigned height,
return true;
}
void menu_display_framebuffer_deinit(void)
{
menu_display_framebuf_width = 0;
menu_display_framebuf_height = 0;
menu_display_framebuf_pitch = 0;
}
void menu_display_deinit(void)
{
if (menu_display_msg_queue)
msg_queue_free(menu_display_msg_queue);
video_coord_array_free(&menu_disp_ca);
menu_display_msg_queue = NULL;
menu_display_msg_force = false;
menu_display_header_height = 0;
menu_disp = NULL;
menu_display_has_windowed = false;
menu_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
menu_display_framebuffer_deinit();
}
bool menu_display_init(void)
{
menu_display_msg_queue = msg_queue_new(8);
menu_disp_ca.allocated = 0;
menu_display_has_windowed = video_driver_has_windowed();
return true;
}
void menu_display_coords_array_reset(void)
{
menu_disp_ca.coords.vertices = 0;
@ -1420,8 +1388,10 @@ static bool menu_init(menu_handle_t *menu_data)
menu_shader_manager_init();
if (!menu_display_init())
return false;
menu_display_msg_queue = msg_queue_new(8);
menu_disp_ca.allocated = 0;
menu_display_has_windowed = video_driver_has_windowed();
return true;
}
@ -1884,7 +1854,21 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
menu_userdata = NULL;
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
menu_display_deinit();
if (menu_display_msg_queue)
msg_queue_free(menu_display_msg_queue);
video_coord_array_free(&menu_disp_ca);
menu_display_msg_queue = NULL;
menu_display_msg_force = false;
menu_display_header_height = 0;
menu_disp = NULL;
menu_display_has_windowed = false;
menu_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
menu_display_framebuf_width = 0;
menu_display_framebuf_height = 0;
menu_display_framebuf_pitch = 0;
menu_entries_ctl(MENU_ENTRIES_CTL_DEINIT, NULL);
command_event(CMD_EVENT_HISTORY_DEINIT, NULL);

5
menu/menu_driver.h
View File

@ -596,11 +596,6 @@ void menu_display_font_free(font_data_t *font);
void menu_display_font_bind_block(font_data_t *font, void *block);
bool menu_display_font_flush_block(unsigned width, unsigned height, font_data_t *font);
void menu_display_framebuffer_deinit(void);
void menu_display_deinit(void);
bool menu_display_init(void);
void menu_display_coords_array_reset(void);
video_coord_array_t *menu_display_get_coords_array(void);
const uint8_t *menu_display_get_font_framebuffer(void);