mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-04-24 22:56:28 +02:00
parent bb43c8115f
commit 18b0fb1422
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/drivers/xmb.c
View File

@ -1911,6 +1911,10 @@ static void xmb_draw_bg(
else else
menu_display_set_alpha(draw.color, coord_white[3]); menu_display_set_alpha(draw.color, coord_white[3]);
draw.pipeline.id = VIDEO_SHADER_MENU_SEC;
if (settings->menu.xmb_ribbon_enable == 2)
draw.pipeline.id = VIDEO_SHADER_MENU;
menu_display_ctl(MENU_DISPLAY_CTL_DRAW_GRADIENT, &draw); menu_display_ctl(MENU_DISPLAY_CTL_DRAW_GRADIENT, &draw);
menu_display_ctl(MENU_DISPLAY_CTL_DRAW_RIBBON, &draw); menu_display_ctl(MENU_DISPLAY_CTL_DRAW_RIBBON, &draw);
} }

5
menu/menu_display.c
View File

@ -547,12 +547,9 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
#if defined(HAVE_GLSL) || defined(HAVE_CG) || defined(HAVE_HLSL) #if defined(HAVE_GLSL) || defined(HAVE_CG) || defined(HAVE_HLSL)
shader_info.data = NULL; shader_info.data = NULL;
shader_info.idx = VIDEO_SHADER_MENU_SEC; shader_info.idx = draw->pipeline.id;
shader_info.set_active = true; shader_info.set_active = true;
if (settings->menu.xmb_ribbon_enable == 2)
shader_info.idx = VIDEO_SHADER_MENU;
video_shader_driver_ctl(SHADER_CTL_USE, &shader_info); video_shader_driver_ctl(SHADER_CTL_USE, &shader_info);
t += 0.01; t += 0.01;

4
menu/menu_display.h
View File

@ -121,6 +121,10 @@ typedef struct menu_display_ctx_draw
const float *vertex; const float *vertex;
const float *tex_coord; const float *tex_coord;
size_t vertex_count; size_t vertex_count;
struct
{
unsigned id;
} pipeline;
} menu_display_ctx_draw_t; } menu_display_ctx_draw_t;
typedef struct menu_display_ctx_rotate_draw typedef struct menu_display_ctx_rotate_draw