From dfb7e08a51675726e00e4fee751e85d01b1409eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 1 Oct 2018 12:44:18 +0200
Subject: [PATCH] TextureTools: simplify the shader preprocessor hell.

---
 .../TextureTools/DistanceFieldShader.frag     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Magnum/TextureTools/DistanceFieldShader.frag b/src/Magnum/TextureTools/DistanceFieldShader.frag
index c2b3e87e7..2a4828000 100644
--- a/src/Magnum/TextureTools/DistanceFieldShader.frag
+++ b/src/Magnum/TextureTools/DistanceFieldShader.frag
@@ -38,18 +38,19 @@
 #endif
 
 #ifdef EXPLICIT_UNIFORM_LOCATION
-layout(location = 0) uniform int radius;
-layout(location = 1) uniform vec2 scaling;
-#else
+layout(location = 0)
+#endif
 uniform lowp int radius;
-uniform mediump vec2 scaling;
+
+#ifdef EXPLICIT_UNIFORM_LOCATION
+layout(location = 1)
 #endif
+uniform mediump vec2 scaling;
 
 #ifdef EXPLICIT_TEXTURE_LAYER
-layout(binding = 7) uniform sampler2D textureData;
-#else
-uniform lowp sampler2D textureData;
+layout(binding = 7)
 #endif
+uniform lowp sampler2D textureData;
 
 #ifdef TEXELFETCH_USABLE
 #ifndef GL_ES
@@ -57,10 +58,9 @@ layout(pixel_center_integer) in mediump vec4 gl_FragCoord;
 #endif
 #else
 #ifdef EXPLICIT_UNIFORM_LOCATION
-layout(location = 2) uniform vec2 imageSizeInverted;
-#else
-uniform mediump vec2 imageSizeInverted;
+layout(location = 2)
 #endif
+uniform mediump vec2 imageSizeInverted;
 #endif
 
 #ifdef NEW_GLSL