tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

24
src/mbgl/programs/gl/line.cpp
View File

@@ -48,7 +48,7 @@ varying highp float v_linesofar;
#ifndef HAS_UNIFORM_u_color
uniform lowp float a_color_t;
uniform lowp float u_color_t;
attribute highp vec4 a_color;
varying highp vec4 color;
#else
@@ -57,7 +57,7 @@ uniform highp vec4 u_color;
#ifndef HAS_UNIFORM_u_blur
uniform lowp float a_blur_t;
uniform lowp float u_blur_t;
attribute lowp vec2 a_blur;
varying lowp float blur;
#else
@@ -66,7 +66,7 @@ uniform lowp float u_blur;
#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
@@ -75,7 +75,7 @@ uniform lowp float u_opacity;
#ifndef HAS_UNIFORM_u_gapwidth
uniform lowp float a_gapwidth_t;
uniform lowp float u_gapwidth_t;
attribute mediump vec2 a_gapwidth;
#else
uniform mediump float u_gapwidth;
@@ -83,7 +83,7 @@ uniform mediump float u_gapwidth;
#ifndef HAS_UNIFORM_u_offset
uniform lowp float a_offset_t;
uniform lowp float u_offset_t;
attribute lowp vec2 a_offset;
#else
uniform lowp float u_offset;
@@ -91,7 +91,7 @@ uniform lowp float u_offset;
#ifndef HAS_UNIFORM_u_width
uniform lowp float a_width_t;
uniform lowp float u_width_t;
attribute mediump vec2 a_width;
#else
uniform mediump float u_width;
@@ -101,42 +101,42 @@ uniform mediump float u_width;
void main() {
#ifndef HAS_UNIFORM_u_color
color = unpack_mix_color(a_color, a_color_t);
color = unpack_mix_color(a_color, u_color_t);
#else
highp vec4 color = u_color;
#endif
#ifndef HAS_UNIFORM_u_blur
blur = unpack_mix_vec2(a_blur, a_blur_t);
blur = unpack_mix_vec2(a_blur, u_blur_t);
#else
lowp float blur = u_blur;
#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
#ifndef HAS_UNIFORM_u_gapwidth
mediump float gapwidth = unpack_mix_vec2(a_gapwidth, a_gapwidth_t);
mediump float gapwidth = unpack_mix_vec2(a_gapwidth, u_gapwidth_t);
#else
mediump float gapwidth = u_gapwidth;
#endif
#ifndef HAS_UNIFORM_u_offset
lowp float offset = unpack_mix_vec2(a_offset, a_offset_t);
lowp float offset = unpack_mix_vec2(a_offset, u_offset_t);
#else
lowp float offset = u_offset;
#endif
#ifndef HAS_UNIFORM_u_width
mediump float width = unpack_mix_vec2(a_width, a_width_t);
mediump float width = unpack_mix_vec2(a_width, u_width_t);
#else
mediump float width = u_width;
#endif