From da6a74b2dc3f91a66fe5e76c70eecc0414f31da5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 28 May 2016 20:58:49 +0200 Subject: [PATCH] Leave only GLSL_330 macro --- gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h | 2 +- gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h | 2 +- gfx/drivers/gl_shaders/shaders_common.h | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h b/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h index 848d8f01e7..f93675553a 100644 --- a/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h +++ b/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.frag.h @@ -1,6 +1,6 @@ #include "shaders_common.h" -static const char *nuklear_fragment_shader = GLSL_330_ES( +static const char *nuklear_fragment_shader = GLSL_330( precision mediump float; uniform sampler2D Texture; in vec2 Frag_UV; diff --git a/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h b/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h index 6fdfc4d2e4..b0c46850d1 100644 --- a/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h +++ b/gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h @@ -1,6 +1,6 @@ #include "shaders_common.h" -static const char *nuklear_vertex_shader = GLSL_330_ES( +static const char *nuklear_vertex_shader = GLSL_330( uniform mat4 ProjMtx; in vec2 Position; in vec2 TexCoord; diff --git a/gfx/drivers/gl_shaders/shaders_common.h b/gfx/drivers/gl_shaders/shaders_common.h index 8d1344d3e1..a07c3a852c 100644 --- a/gfx/drivers/gl_shaders/shaders_common.h +++ b/gfx/drivers/gl_shaders/shaders_common.h @@ -3,12 +3,10 @@ #if defined(HAVE_OPENGLES) #define GLSL(src) "precision mediump float;\n" #src -#define GLSL_330_ES(src) "#version 330 es\nprecision mediump float;\n" #src -#define GLSL_330_CORE(src) "#version 330 es\nprecision mediump float;\n" #src +#define GLSL_330(src) "#version 330 es\nprecision mediump float;\n" #src #else #define GLSL(src) "" #src -#define GLSL_330_ES(src) "#version 330 core\n" #src -#define GLSL_330_CORE(src) "#version 330 core\n" #src +#define GLSL_330(src) "#version 330 core\n" #src #endif -#endif \ No newline at end of file +#endif