[core] use constexpr string concatenation for uniform/attribute names

This commit is contained in:
Konstantin Käfer
2019-03-19 14:02:10 +01:00
parent 0ad2375e10
commit 53ab65d811
27 changed files with 621 additions and 533 deletions

View File

@@ -29,7 +29,7 @@ varying vec2 v_pos;
#ifndef HAS_UNIFORM_u_outline_color
uniform lowp float a_outline_color_t;
uniform lowp float u_outline_color_t;
attribute highp vec4 a_outline_color;
varying highp vec4 outline_color;
#else
@@ -38,7 +38,7 @@ uniform highp vec4 u_outline_color;
#ifndef HAS_UNIFORM_u_opacity
uniform lowp float a_opacity_t;
uniform lowp float u_opacity_t;
attribute lowp vec2 a_opacity;
varying lowp float opacity;
#else
@@ -49,14 +49,14 @@ uniform lowp float u_opacity;
void main() {
#ifndef HAS_UNIFORM_u_outline_color
outline_color = unpack_mix_color(a_outline_color, a_outline_color_t);
outline_color = unpack_mix_color(a_outline_color, u_outline_color_t);
#else
highp vec4 outline_color = u_outline_color;
#endif
#ifndef HAS_UNIFORM_u_opacity
opacity = unpack_mix_vec2(a_opacity, a_opacity_t);
opacity = unpack_mix_vec2(a_opacity, u_opacity_t);
#else
lowp float opacity = u_opacity;
#endif