diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-21 23:02:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 23:02:32 +0100 |
| commit | 3548b6b6b2e2afbe1efa34e298a07664fdee2289 (patch) | |
| tree | b9307a3f964e8bc2992130794f94b65d5e1a6265 | |
| parent | 6fa632b82121aff5537d627364d2f10fdeafc418 (diff) | |
| parent | e7e9a7cc6cc5e7bde5b1733dfac7a708cd84571d (diff) | |
Merge pull request #25196 from santouits/webgl-backslashes
webgl1 in firefox doesn't like backslashes in #define directive
| -rw-r--r-- | drivers/gles2/shaders/canvas.glsl | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index 0de60d7421..d483659e4d 100644 --- 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 |