From d1bf61076d33c86859dbfcb7f43d5ae6a1800eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sat, 19 Nov 2016 00:27:54 +0100 Subject: [PATCH] Make shader names consistent, step 3 --- .../gl_shaders/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h | 2 +- gfx/drivers_shader/shader_glsl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h b/gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h index 1713451fd2..bab076d34b 100644 --- a/gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h +++ b/gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon_simple.glsl.vert.h @@ -1,6 +1,6 @@ #include "shaders_common.h" -static const char *stock_vertex_xmb_simple_legacy = GLSL( +static const char *stock_vertex_xmb_ribbon_simple_legacy = GLSL( attribute vec3 VertexCoord; uniform float time; float iqhash( float n ) diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index 0d27d8cc55..9fcefa54c1 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -938,7 +938,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_simple_legacy; + shader_prog_info.vertex = stock_vertex_xmb_ribbon_simple_legacy; shader_prog_info.fragment = stock_fragment_xmb_simple; #else shader_prog_info.vertex = glsl_core ? stock_vertex_xmb_ribbon_modern : stock_vertex_xmb_ribbon_legacy; @@ -954,7 +954,7 @@ static void *gl_glsl_init(void *data, const char *path) gl_glsl_find_uniforms(glsl, 0, glsl->prg[VIDEO_SHADER_MENU].id, &glsl->uniforms[VIDEO_SHADER_MENU]); - shader_prog_info.vertex = glsl_core ? stock_vertex_xmb_simple_modern : stock_vertex_xmb_simple_legacy; + 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; gl_glsl_compile_program(