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

Rename VIDEO_SHADER_MENU_SEC to VIDEO_SHADER_MENU_2

Browse Source
This commit is contained in:
twinaphex 2016-12-06 00:34:38 +01:00
parent 2b07cf0d41
commit abaa6eda62
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/drivers_shader/shader_gl_cg.c
View File

@ -1092,10 +1092,10 @@ static void *gl_cg_init(void *data, const char *path)
gl_cg_compile_program(
cg,
VIDEO_SHADER_MENU_SEC,
&cg->prg[VIDEO_SHADER_MENU_SEC],
VIDEO_SHADER_MENU_2,
&cg->prg[VIDEO_SHADER_MENU_2],
&shader_prog_info);
gl_cg_set_program_base_attrib(cg, VIDEO_SHADER_MENU_SEC);
gl_cg_set_program_base_attrib(cg, VIDEO_SHADER_MENU_2);
shader_prog_info.combined = stock_xmb_snow;
shader_prog_info.is_file = false;

8
gfx/drivers_shader/shader_glsl.c
View File

@ -955,11 +955,11 @@ static void *gl_glsl_init(void *data, const char *path)
gl_glsl_compile_program(
glsl,
VIDEO_SHADER_MENU_SEC,
&glsl->prg[VIDEO_SHADER_MENU_SEC],
VIDEO_SHADER_MENU_2,
&glsl->prg[VIDEO_SHADER_MENU_2],
&shader_prog_info);
gl_glsl_find_uniforms(glsl, 0, glsl->prg[VIDEO_SHADER_MENU_SEC].id,
&glsl->uniforms[VIDEO_SHADER_MENU_SEC]);
gl_glsl_find_uniforms(glsl, 0, glsl->prg[VIDEO_SHADER_MENU_2].id,
&glsl->uniforms[VIDEO_SHADER_MENU_2]);
#if defined(HAVE_OPENGLES)
shader_prog_info.vertex = stock_vertex_xmb_snow_modern;

3
gfx/video_shader_driver.h
View File

@ -36,8 +36,9 @@
#define VIDEO_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1)
#define VIDEO_SHADER_MENU (GFX_MAX_SHADERS - 2)
#define VIDEO_SHADER_MENU_SEC (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_4 (GFX_MAX_SHADERS - 4)
#endif

2
menu/drivers/xmb.c
View File

@ -2383,7 +2383,7 @@ static void xmb_draw_bg(
menu_display_draw_gradient(&draw);
draw.pipeline.id = VIDEO_SHADER_MENU_SEC;
draw.pipeline.id = VIDEO_SHADER_MENU_2;
switch (settings->menu.xmb.shader_pipeline)
{

2
menu/drivers_display/menu_display_gl.c
View File

@ -168,7 +168,7 @@ static void menu_display_gl_draw_pipeline(void *data)
switch (draw->pipeline.id)
{
case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_SEC:
case VIDEO_SHADER_MENU_2:
case VIDEO_SHADER_MENU_3:
{
static float t = 0;

4
menu/drivers_display/menu_display_vulkan.c
View File

@ -73,7 +73,7 @@ static unsigned to_menu_pipeline(
{
case VIDEO_SHADER_MENU:
return 4 + (type == MENU_DISPLAY_PRIM_TRIANGLESTRIP);
case VIDEO_SHADER_MENU_SEC:
case VIDEO_SHADER_MENU_2:
return 6 + (type == MENU_DISPLAY_PRIM_TRIANGLESTRIP);
default:
return 0;
@ -173,7 +173,7 @@ static void menu_display_vk_draw(void *data)
{
#ifdef HAVE_SHADERPIPELINE
case VIDEO_SHADER_MENU:
case VIDEO_SHADER_MENU_SEC:
case VIDEO_SHADER_MENU_2:
{
const struct vk_draw_triangles call = {
vk->display.pipelines[