From c1de2e569770837d42f0099f95b8838c5f33dc27 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 23 Nov 2018 23:57:22 +0100 Subject: [PATCH] Cleanup shaders_common.h --- gfx/drivers/gl_shaders/shaders_common.h | 44 +++++++++++-------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/gfx/drivers/gl_shaders/shaders_common.h b/gfx/drivers/gl_shaders/shaders_common.h index 3ea1fbc955..8a97a09ba6 100644 --- a/gfx/drivers/gl_shaders/shaders_common.h +++ b/gfx/drivers/gl_shaders/shaders_common.h @@ -1,33 +1,27 @@ #ifndef _SHADERS_COMMON #define _SHADERS_COMMON +#define GLSL_DERIV_PREAMBLE() "#extension GL_OES_standard_derivatives : enable\n" +#define GLSL_PREAMBLE() \ + "#ifdef GL_ES\n" \ + " #ifdef GL_FRAGMENT_PRECISION_HIGH\n" \ + " precision highp float;\n" \ + " #else\n" \ + " precision mediump float;\n" \ + " #endif\n" \ + "#else\n" \ + " precision mediump float;\n" \ + "#endif\n" + #if defined(HAVE_OPENGLES) -#define CG(src) "" #src -#define GLSL(src) "#extension GL_OES_standard_derivatives : enable\n" \ - "#ifdef GL_ES\n" \ - " #ifdef GL_FRAGMENT_PRECISION_HIGH\n" \ - " precision highp float;\n" \ - " #else\n" \ - " precision mediump float;\n" \ - " #endif\n" \ - "#else\n" \ - " precision mediump float;\n" \ - "#endif\n" #src -#define GLSL_330(src) "#version 330 es\n" \ - "#ifdef GL_ES\n" \ - " #ifdef GL_FRAGMENT_PRECISION_HIGH\n" \ - " precision highp float;\n" \ - " #else\n" \ - " precision mediump float;\n" \ - " #endif\n" \ - "#else\n" \ - " precision mediump float;\n" \ - "#endif\n" #src +#define CG(src) "" #src +#define GLSL(src) GLSL_DERIV_PREAMBLE() GLSL_PREAMBLE() #src +#define GLSL_330(src) "#version 330 es\n" GLSL_PREAMBLE() #src #else -#define CG(src) "" #src -#define GLSL(src) "" #src -#define GLSL_300(src) "#version 300 es\n" #src -#define GLSL_330(src) "#version 330 core\n" #src +#define CG(src) "" #src +#define GLSL(src) "" GLSL_PREAMBLE() #src +#define GLSL_300(src) "#version 300 es\n" GLSL_PREAMBLE() #src +#define GLSL_330(src) "#version 330 core\n" GLSL_PREAMBLE() #src #endif #endif