Merge pull request #25196 from santouits/webgl-backslashes

webgl1 in firefox doesn't like backslashes in #define directive

Merge pull request #25196 from santouits/webgl-backslashes
3548b6b6 · Rémi Verschelde · GitHub · 6fa632b8 · e7e9a7cc · 3548b6b6
Unverified Commit 3548b6b6 authored Jan 21, 2019 by Rémi Verschelde Committed by GitHub Jan 21, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 10 deletions

canvas.glsl drivers/gles2/shaders/canvas.glsl +5 -10

No files found.
--- a/drivers/gles2/shaders/canvas.glsl
+++ b/drivers/gles2/shaders/canvas.glsl
@@ -433,19 +433,14 @@ FRAGMENT_SHADER_CODE

 #ifdef SHADOW_USE_GRADIENT

-#define SHADOW_TEST(m_ofs)                                                    \
-	{                                                                         \
-		highp float sd = SHADOW_DEPTH(shadow_texture, vec2(m_ofs, sh));       \
-		shadow_attenuation += 1.0 - smoothstep(sd, sd + shadow_gradient, sz); \
-	}
+		/* clang-format off */
+		/* GLSL es 100 doesn't support line continuation characters(backslashes) */
+#define SHADOW_TEST(m_ofs) { highp float sd = SHADOW_DEPTH(shadow_texture, vec2(m_ofs, sh)); shadow_attenuation += 1.0 - smoothstep(sd, sd + shadow_gradient, sz); }

 #else

-#define SHADOW_TEST(m_ofs)                                              \
-	{                                                                   \
-		highp float sd = SHADOW_DEPTH(shadow_texture, vec2(m_ofs, sh)); \
-		shadow_attenuation += step(sz, sd);                             \
-	}
+#define SHADOW_TEST(m_ofs) { highp float sd = SHADOW_DEPTH(shadow_texture, vec2(m_ofs, sh)); shadow_attenuation += step(sz, sd); }
+		/* clang-format on */

 #endif