From 35d8ec12c57675e5e729f26f77bea5bd1295d5e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sat, 19 Nov 2016 00:23:07 +0100 Subject: [PATCH] Make shader names consistent, step 2 --- gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon.glsl.vert.h | 2 +- gfx/drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h | 2 +- gfx/drivers_shader/shader_glsl.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon.glsl.vert.h b/gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon.glsl.vert.h index 889e08be9f..c5814a2456 100644 --- a/gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon.glsl.vert.h +++ b/gfx/drivers/gl_shaders/legacy_pipeline_xmb_ribbon.glsl.vert.h @@ -1,6 +1,6 @@ #include "shaders_common.h" -static const char *stock_vertex_xmb_legacy = GLSL( +static const char *stock_vertex_xmb_ribbon_legacy = GLSL( attribute vec3 VertexCoord; uniform float time; varying vec3 fragVertexEc; diff --git a/gfx/drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h b/gfx/drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h index 93a083d8c2..0e60e568dc 100644 --- a/gfx/drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h +++ b/gfx/drivers/gl_shaders/modern_pipeline_xmb_ribbon.glsl.vert.h @@ -1,6 +1,6 @@ #include "shaders_common.h" -static const char *stock_vertex_xmb_modern = GLSL( +static const char *stock_vertex_xmb_ribbon_modern = GLSL( in vec3 VertexCoord; uniform float time; out vec3 fragVertexEc; diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c index cd956100a0..0d27d8cc55 100644 --- a/gfx/drivers_shader/shader_glsl.c +++ b/gfx/drivers_shader/shader_glsl.c @@ -941,7 +941,7 @@ static void *gl_glsl_init(void *data, const char *path) shader_prog_info.vertex = stock_vertex_xmb_simple_legacy; shader_prog_info.fragment = stock_fragment_xmb_simple; #else - shader_prog_info.vertex = glsl_core ? stock_vertex_xmb_modern : stock_vertex_xmb_legacy; + shader_prog_info.vertex = glsl_core ? stock_vertex_xmb_ribbon_modern : stock_vertex_xmb_ribbon_legacy; shader_prog_info.fragment = stock_fragment_xmb; #endif shader_prog_info.is_file = false;