diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index 5d06c6c97f..98d851bad9 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -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; diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index 5d4f3fe96d..ca1cccbfc7 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -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; diff --git a/gfx/video_shader_driver.h b/gfx/video_shader_driver.h index fb15b17ebc..4c7502e5e5 100644 --- a/gfx/video_shader_driver.h +++ b/gfx/video_shader_driver.h @@ -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 diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 0db55c408f..9d1b3da72b 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -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) { diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c index b520a52ec8..38c156ac37 100644 --- a/menu/drivers_display/menu_display_gl.c +++ b/menu/drivers_display/menu_display_gl.c @@ -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; diff --git a/menu/drivers_display/menu_display_vulkan.c b/menu/drivers_display/menu_display_vulkan.c index 5972a64931..2840288da1 100644 --- a/menu/drivers_display/menu_display_vulkan.c +++ b/menu/drivers_display/menu_display_vulkan.c @@ -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[