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

(Lakka/GL) Take out HAVE_LAKKA hack in gl.c - animations/tweening needs to

Browse Source 
be fixed though
This commit is contained in:
twinaphex 2014-05-11 20:47:44 +02:00
parent 6d99bb2e2a
commit d9e31151ed
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/menu/disp/lakka.c
View File

@ -616,7 +616,7 @@ void lakka_draw_icon(void *data, GLuint texture, float x, float y, float alpha,
gl->coords.color = gl->white_color_ptr; gl->coords.color = gl->white_color_ptr;
} }
void lakka_render(void *data) static void lakka_frame(void *data)
{ {
int i, j, k; int i, j, k;
struct font_output_list msg; struct font_output_list msg;
@ -1011,8 +1011,8 @@ static void *lakka_init(void)
const menu_ctx_driver_t menu_ctx_lakka = { const menu_ctx_driver_t menu_ctx_lakka = {
NULL, NULL,
NULL, NULL,
lakka_render,
NULL, NULL,
lakka_frame,
lakka_init, lakka_init,
lakka_free, lakka_free,
lakka_init_assets, lakka_init_assets,

1
frontend/menu/disp/lakka.h
View File

@ -64,7 +64,6 @@ typedef struct
extern menu_category *categories; extern menu_category *categories;
void lakka_render(void *data);
void lakka_switch_items(void); void lakka_switch_items(void);
void lakka_switch_subitems(void); void lakka_switch_subitems(void);
void lakka_open_submenu(void); void lakka_open_submenu(void);

4
gfx/gl.c
View File

@ -1587,11 +1587,7 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
driver.menu_ctx->frame(gl); driver.menu_ctx->frame(gl);
if (gl->rgui_texture_enable) if (gl->rgui_texture_enable)
#if defined(HAVE_LAKKA)
lakka_render(gl);
#else
gl_draw_texture(gl); gl_draw_texture(gl);
#endif
#endif #endif
if (msg && gl->font_ctx) if (msg && gl->font_ctx)