From 9c83658368c322ef6819f377be3098ae4862a397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sat, 19 Nov 2016 00:29:13 +0100 Subject: [PATCH] Make shader names consistent, step 4 --- gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.glsl.frag.h | 2 +- gfx/drivers_shader/shader_glsl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.glsl.frag.h index ba7df06ab6..26c4081b44 100644 --- a/gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.glsl.frag.h +++ b/gfx/drivers/gl_shaders/pipeline_xmb_ribbon_simple.glsl.frag.h @@ -1,6 +1,6 @@ #include "shaders_common.h" -static const char *stock_fragment_xmb_simple = GLSL( +static const char *stock_fragment_xmb_ribbon_simple = GLSL( uniform float time; void main() diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index 9fcefa54c1..b406f12415 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -939,7 +939,7 @@ static void *gl_glsl_init(void *data, const char *path) #ifdef HAVE_SHADERPIPELINE #if defined(HAVE_OPENGLES) shader_prog_info.vertex = stock_vertex_xmb_ribbon_simple_legacy; - shader_prog_info.fragment = stock_fragment_xmb_simple; + shader_prog_info.fragment = stock_fragment_xmb_ribbon_simple; #else shader_prog_info.vertex = glsl_core ? stock_vertex_xmb_ribbon_modern : stock_vertex_xmb_ribbon_legacy; shader_prog_info.fragment = stock_fragment_xmb; @@ -955,7 +955,7 @@ static void *gl_glsl_init(void *data, const char *path) &glsl->uniforms[VIDEO_SHADER_MENU]); shader_prog_info.vertex = glsl_core ? stock_vertex_xmb_simple_modern : stock_vertex_xmb_ribbon_simple_legacy; - shader_prog_info.fragment = stock_fragment_xmb_simple; + shader_prog_info.fragment = stock_fragment_xmb_ribbon_simple; gl_glsl_compile_program( glsl,