mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 16:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename MENU_DISPLAY_CTL_DRAW_RIBBON to MENU_DISPLAY_CTL_DRAW_PIPELINE

Browse Source
This commit is contained in:
twinaphex 2016-04-24 23:05:24 +02:00
parent 18b0fb1422
commit 78d48c53d2
3 changed files with 23 additions and 17 deletions

2
menu/drivers/xmb.c

@ -1916,7 +1916,7 @@ static void xmb_draw_bg(
draw.pipeline.id = VIDEO_SHADER_MENU; 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_PIPELINE, &draw);
} }
else else
{ {

36
menu/menu_display.c

@ -530,7 +530,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
menu_display_ctl(MENU_DISPLAY_CTL_DRAW_BG, draw); menu_display_ctl(MENU_DISPLAY_CTL_DRAW_BG, draw);
} }
break; break;
case MENU_DISPLAY_CTL_DRAW_RIBBON: case MENU_DISPLAY_CTL_DRAW_PIPELINE:
{ {
menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data; menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
struct uniform_info uniform_param = {0}; struct uniform_info uniform_param = {0};
@ -546,24 +546,30 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
draw->matrix_data = NULL; draw->matrix_data = NULL;
#if defined(HAVE_GLSL) || defined(HAVE_CG) || defined(HAVE_HLSL) #if defined(HAVE_GLSL) || defined(HAVE_CG) || defined(HAVE_HLSL)
shader_info.data = NULL; switch (draw->pipeline.id)
shader_info.idx = draw->pipeline.id; {
shader_info.set_active = true; case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_SEC:
shader_info.data = NULL;
shader_info.idx = draw->pipeline.id;
shader_info.set_active = true;
video_shader_driver_ctl(SHADER_CTL_USE, &shader_info); video_shader_driver_ctl(SHADER_CTL_USE, &shader_info);
t += 0.01; t += 0.01;
uniform_param.enabled = true; uniform_param.enabled = true;
uniform_param.lookup.enable = true; uniform_param.lookup.enable = true;
uniform_param.lookup.add_prefix = true; uniform_param.lookup.add_prefix = true;
uniform_param.lookup.idx = VIDEO_SHADER_MENU; uniform_param.lookup.idx = VIDEO_SHADER_MENU;
uniform_param.lookup.type = SHADER_PROGRAM_VERTEX; uniform_param.lookup.type = SHADER_PROGRAM_VERTEX;
uniform_param.type = UNIFORM_1F; uniform_param.type = UNIFORM_1F;
uniform_param.lookup.ident = "time"; uniform_param.lookup.ident = "time";
uniform_param.result.f.v0 = t; uniform_param.result.f.v0 = t;
video_shader_driver_ctl(SHADER_CTL_SET_PARAMETER, &uniform_param); video_shader_driver_ctl(SHADER_CTL_SET_PARAMETER, &uniform_param);
break;
}
#endif #endif
menu_display_ctl(MENU_DISPLAY_CTL_DRAW, draw); menu_display_ctl(MENU_DISPLAY_CTL_DRAW, draw);

2
menu/menu_display.h

@ -76,7 +76,7 @@ enum menu_display_ctl_state
MENU_DISPLAY_CTL_DRAW, MENU_DISPLAY_CTL_DRAW,
MENU_DISPLAY_CTL_DRAW_BG, MENU_DISPLAY_CTL_DRAW_BG,
MENU_DISPLAY_CTL_DRAW_GRADIENT, MENU_DISPLAY_CTL_DRAW_GRADIENT,
MENU_DISPLAY_CTL_DRAW_RIBBON, MENU_DISPLAY_CTL_DRAW_PIPELINE,
MENU_DISPLAY_CTL_ROTATE_Z, MENU_DISPLAY_CTL_ROTATE_Z,
MENU_DISPLAY_CTL_TEX_COORDS_GET, MENU_DISPLAY_CTL_TEX_COORDS_GET,
MENU_DISPLAY_CTL_TIMEDATE, MENU_DISPLAY_CTL_TIMEDATE,