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

(XMB) Add Bokeh menu pipeline

Browse Source
This commit is contained in:
twinaphex 2017-01-08 03:56:47 +01:00
parent 77663d1a96
commit c8bc6c7120
16 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/drivers_shader/shader_glsl.c
View File

@ -1002,6 +1002,21 @@ static void *gl_glsl_init(void *data, const char *path)
&shader_prog_info); &shader_prog_info);
gl_glsl_find_uniforms(glsl, 0, glsl->prg[VIDEO_SHADER_MENU_4].id, gl_glsl_find_uniforms(glsl, 0, glsl->prg[VIDEO_SHADER_MENU_4].id,
&glsl->uniforms[VIDEO_SHADER_MENU_4]); &glsl->uniforms[VIDEO_SHADER_MENU_4]);
#if defined(HAVE_OPENGLES)
shader_prog_info.vertex = stock_vertex_xmb_snow_modern;
#else
shader_prog_info.vertex = glsl_core ? stock_vertex_xmb_snow_modern : stock_vertex_xmb_snow_legacy;
#endif
shader_prog_info.fragment = stock_fragment_xmb_bokeh;
gl_glsl_compile_program(
glsl,
VIDEO_SHADER_MENU_5,
&glsl->prg[VIDEO_SHADER_MENU_5],
&shader_prog_info);
gl_glsl_find_uniforms(glsl, 0, glsl->prg[VIDEO_SHADER_MENU_5].id,
&glsl->uniforms[VIDEO_SHADER_MENU_5]);
#endif #endif
gl_glsl_reset_attrib(glsl); gl_glsl_reset_attrib(glsl);

1
gfx/video_shader_driver.h
View File

@ -39,6 +39,7 @@
#define VIDEO_SHADER_MENU_2 (GFX_MAX_SHADERS - 3) #define VIDEO_SHADER_MENU_2 (GFX_MAX_SHADERS - 3)
#define VIDEO_SHADER_MENU_3 (GFX_MAX_SHADERS - 4) #define VIDEO_SHADER_MENU_3 (GFX_MAX_SHADERS - 4)
#define VIDEO_SHADER_MENU_4 (GFX_MAX_SHADERS - 5) #define VIDEO_SHADER_MENU_4 (GFX_MAX_SHADERS - 5)
#define VIDEO_SHADER_MENU_5 (GFX_MAX_SHADERS - 6)
#endif #endif

2
intl/msg_hash_de.h
View File

@ -898,3 +898,5 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_BROWSE_START, MENU_ENUM_LABEL_VALUE_BROWSE_START,
"Start" "Start"
) )
MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH,
"Bokeh")

2
intl/msg_hash_eo.h
View File

@ -2259,3 +2259,5 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_BROWSE_START, MENU_ENUM_LABEL_VALUE_BROWSE_START,
"Start" "Start"
) )
MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH,
"Bokeh")

2
intl/msg_hash_fr.h
View File

@ -2225,3 +2225,5 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_BROWSE_START, MENU_ENUM_LABEL_VALUE_BROWSE_START,
"Start" "Start"
) )
MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH,
"Bokeh")

2
intl/msg_hash_ja.h
View File

@ -2380,3 +2380,5 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_BROWSE_START, MENU_ENUM_LABEL_VALUE_BROWSE_START,
"Start" "Start"
) )
MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH,
"Bokeh")

2
intl/msg_hash_lbl.h
View File

@ -1179,3 +1179,5 @@ MSG_HASH(MENU_ENUM_LABEL_BROWSE_URL,
"browse_url") "browse_url")
MSG_HASH(MENU_ENUM_LABEL_BROWSE_START, MSG_HASH(MENU_ENUM_LABEL_BROWSE_START,
"browse_start") "browse_start")
MSG_HASH(MENU_ENUM_LABEL_SHADER_PIPELINE_BOKEH,
"shader_pipeline_bokeh")

2
intl/msg_hash_nl.h
View File

@ -2259,3 +2259,5 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_BROWSE_START, MENU_ENUM_LABEL_VALUE_BROWSE_START,
"Start" "Start"
) )
MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH,
"Bokeh")

2
intl/msg_hash_ru.h
View File

@ -2258,3 +2258,5 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_BROWSE_START, MENU_ENUM_LABEL_VALUE_BROWSE_START,
"Start" "Start"
) )
MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH,
"Bokeh")

2
intl/msg_hash_us.h
View File

@ -2377,3 +2377,5 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_BROWSE_START, MENU_ENUM_LABEL_VALUE_BROWSE_START,
"Start" "Start"
) )
MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH,
"Bokeh")

5
menu/cbs/menu_cbs_get_value.c
View File

@ -235,6 +235,11 @@ static void menu_action_setting_disp_set_label_pipeline(
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SNOW), len); MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SNOW), len);
break; break;
case XMB_SHADER_PIPELINE_BOKEH:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH), len);
break;
} }
strlcpy(s2, path, len2); strlcpy(s2, path, len2);

3
menu/drivers/xmb.c
View File

@ -2453,6 +2453,9 @@ static void xmb_draw_bg(
case XMB_SHADER_PIPELINE_SNOW: case XMB_SHADER_PIPELINE_SNOW:
draw.pipeline.id = VIDEO_SHADER_MENU_4; draw.pipeline.id = VIDEO_SHADER_MENU_4;
break; break;
case XMB_SHADER_PIPELINE_BOKEH:
draw.pipeline.id = VIDEO_SHADER_MENU_5;
break;
default: default:
break; break;
} }

2
menu/drivers_display/menu_display_gl.c
View File

@ -174,6 +174,7 @@ static void menu_display_gl_draw_pipeline(void *data)
case VIDEO_SHADER_MENU_2: case VIDEO_SHADER_MENU_2:
case VIDEO_SHADER_MENU_3: case VIDEO_SHADER_MENU_3:
case VIDEO_SHADER_MENU_4: case VIDEO_SHADER_MENU_4:
case VIDEO_SHADER_MENU_5:
shader_info.data = NULL; shader_info.data = NULL;
shader_info.idx = draw->pipeline.id; shader_info.idx = draw->pipeline.id;
shader_info.set_active = true; shader_info.set_active = true;
@ -203,6 +204,7 @@ static void menu_display_gl_draw_pipeline(void *data)
{ {
case VIDEO_SHADER_MENU_3: case VIDEO_SHADER_MENU_3:
case VIDEO_SHADER_MENU_4: case VIDEO_SHADER_MENU_4:
case VIDEO_SHADER_MENU_5:
#ifndef HAVE_PSGL #ifndef HAVE_PSGL
uniform_param.type = UNIFORM_2F; uniform_param.type = UNIFORM_2F;
uniform_param.lookup.ident = "OutputSize"; uniform_param.lookup.ident = "OutputSize";

1
menu/drivers_display/menu_display_vulkan.c
View File

@ -176,6 +176,7 @@ static void menu_display_vk_draw(void *data)
case VIDEO_SHADER_MENU_2: case VIDEO_SHADER_MENU_2:
case VIDEO_SHADER_MENU_3: case VIDEO_SHADER_MENU_3:
case VIDEO_SHADER_MENU_4: case VIDEO_SHADER_MENU_4:
case VIDEO_SHADER_MENU_5:
{ {
const struct vk_draw_triangles call = { const struct vk_draw_triangles call = {
vk->display.pipelines[ vk->display.pipelines[

1
menu/menu_display.h
View File

@ -76,6 +76,7 @@ enum xmb_shader_pipeline
XMB_SHADER_PIPELINE_RIBBON, XMB_SHADER_PIPELINE_RIBBON,
XMB_SHADER_PIPELINE_SIMPLE_SNOW, XMB_SHADER_PIPELINE_SIMPLE_SNOW,
XMB_SHADER_PIPELINE_SNOW, XMB_SHADER_PIPELINE_SNOW,
XMB_SHADER_PIPELINE_BOKEH,
XMB_SHADER_PIPELINE_LAST XMB_SHADER_PIPELINE_LAST
}; };

1
msg_hash.h
View File

@ -408,6 +408,7 @@ enum msg_hash_enums
MENU_LABEL(SHADER_PIPELINE_RIBBON), MENU_LABEL(SHADER_PIPELINE_RIBBON),
MENU_LABEL(SHADER_PIPELINE_SIMPLE_SNOW), MENU_LABEL(SHADER_PIPELINE_SIMPLE_SNOW),
MENU_LABEL(SHADER_PIPELINE_SNOW), MENU_LABEL(SHADER_PIPELINE_SNOW),
MENU_LABEL(SHADER_PIPELINE_BOKEH),
MENU_LABEL(MATERIALUI_MENU_HEADER_OPACITY), MENU_LABEL(MATERIALUI_MENU_HEADER_OPACITY),
MENU_LABEL(MATERIALUI_MENU_FOOTER_OPACITY), MENU_LABEL(MATERIALUI_MENU_FOOTER_OPACITY),