From d4296b016f52d3596441ba527d249b91b4c120a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sat, 19 Nov 2016 00:30:56 +0100 Subject: [PATCH] Make shader names consistent, step 5 --- gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h | 2 +- gfx/drivers_shader/shader_gl_cg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h b/gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h index 53dfa09483..805d32c25b 100644 --- a/gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h +++ b/gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.cg.h @@ -1,6 +1,6 @@ #include "shaders_common.h" -static const char *stock_xmb_simple = CG( +static const char *stock_xmb_ribbon_simple = CG( struct input { float time; diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index fe1360a413..40c2c243f3 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -1071,7 +1071,7 @@ static void *gl_cg_init(void *data, const char *path) gl_cg_set_shaders(cg->prg[1].fprg, cg->prg[1].vprg); #ifdef HAVE_SHADERPIPELINE - shader_prog_info.combined = stock_xmb_simple; + shader_prog_info.combined = stock_xmb_ribbon_simple; shader_prog_info.is_file = false; gl_cg_compile_program( @@ -1081,7 +1081,7 @@ static void *gl_cg_init(void *data, const char *path) &shader_prog_info); gl_cg_set_program_base_attrib(cg, VIDEO_SHADER_MENU); - shader_prog_info.combined = stock_xmb_simple; + shader_prog_info.combined = stock_xmb_ribbon_simple; shader_prog_info.is_file = false; gl_cg_compile_program(