CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-14 16:28:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "(RMenu) Refactor rmenu"

Browse Source 
This reverts commit 6e8e22a458eaafa10af381133eb5edcf16cbb6ae.
This commit is contained in:
twinaphex 2014-02-25 19:21:20 +01:00
parent 107c07c05d
commit be10872f7d
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
frontend/menu/disp/rmenu.c
View File

@ -112,6 +112,7 @@ static void rmenu_render_messagebox(void *data, const char *message)
}
render_normal = false;
}
@ -122,19 +123,6 @@ static void rmenu_render(void *data)
render_normal = true;
return;
}
if (!menu_texture && !menu_texture_inited)
{
if (g_extern.video_active && driver.video_data)
{
menu_texture = (struct texture_image*)calloc(1, sizeof(*menu_texture));
texture_image_load(g_extern.menu_texture_path, menu_texture);
rgui->width = menu_texture->width;
rgui->height = menu_texture->height;
rmenu_set_texture(rgui, true);
}
return;
}
rgui_handle_t *rgui = (rgui_handle_t*)data;
font_params_t font_parms;
@ -409,23 +397,39 @@ void rmenu_set_texture(void *data, bool enable)
}
}
static void rmenu_init_assets(void *data)
{
rgui_handle_t *rgui = (rgui_handle_t*)data;
if (!rgui)
return;
menu_texture = (struct texture_image*)calloc(1, sizeof(*menu_texture));
texture_image_load(g_extern.menu_texture_path, menu_texture);
rgui->width = menu_texture->width;
rgui->height = menu_texture->height;
rmenu_set_texture(rgui, true);
}
static void *rmenu_init(void)
{
rgui_handle_t *rgui = (rgui_handle_t*)calloc(1, sizeof(*rgui));
if (!rgui)
return NULL;
rmenu_init_assets(rgui);
return rgui;
}
static void rmenu_free_assets(void *data)
{
texture_image_free(menu_texture);
menu_texture_inited = false;
}
static void rmenu_free(void *data)
{
if (menu_texture)
{
texture_image_free(menu_texture);
menu_texture_inited = false;
}
rmenu_free_assets(data);
}
int rgui_input_postprocess(void *data, uint64_t old_state)
@ -445,13 +449,15 @@ int rgui_input_postprocess(void *data, uint64_t old_state)
return ret;
}
const menu_ctx_driver_t menu_ctx_rmenu = {
rmenu_set_texture,
rmenu_render_messagebox,
rmenu_render,
rmenu_init,
rmenu_free,
NULL,
rmenu_init_assets,
rmenu_free_assets,
NULL,
NULL,
"rmenu",