diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-19 14:02:10 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-20 15:40:47 +0100 |
commit | 53ab65d81165daf4e23ce28fa0e42861724ea687 (patch) | |
tree | 402a535476210bf3527b487011a0f7ccb78ef73d /src/mbgl/programs/gl/fill_extrusion_pattern.cpp | |
parent | 0ad2375e1047353fc65fabce3ac9123dc095179e (diff) | |
download | qtlocation-mapboxgl-53ab65d81165daf4e23ce28fa0e42861724ea687.tar.gz |
[core] use constexpr string concatenation for uniform/attribute names
Diffstat (limited to 'src/mbgl/programs/gl/fill_extrusion_pattern.cpp')
-rw-r--r-- | src/mbgl/programs/gl/fill_extrusion_pattern.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/programs/gl/fill_extrusion_pattern.cpp b/src/mbgl/programs/gl/fill_extrusion_pattern.cpp index 9c2da87b11..94a663947a 100644 --- a/src/mbgl/programs/gl/fill_extrusion_pattern.cpp +++ b/src/mbgl/programs/gl/fill_extrusion_pattern.cpp @@ -40,7 +40,7 @@ varying vec4 v_lighting; #ifndef HAS_UNIFORM_u_base -uniform lowp float a_base_t; +uniform lowp float u_base_t; attribute lowp vec2 a_base; varying lowp float base; #else @@ -49,7 +49,7 @@ uniform lowp float u_base; #ifndef HAS_UNIFORM_u_height -uniform lowp float a_height_t; +uniform lowp float u_height_t; attribute lowp vec2 a_height; varying lowp float height; #else @@ -58,7 +58,7 @@ uniform lowp float u_height; #ifndef HAS_UNIFORM_u_pattern_from -uniform lowp float a_pattern_from_t; +uniform lowp float u_pattern_from_t; attribute lowp vec4 a_pattern_from; varying lowp vec4 pattern_from; #else @@ -67,7 +67,7 @@ uniform lowp vec4 u_pattern_from; #ifndef HAS_UNIFORM_u_pattern_to -uniform lowp float a_pattern_to_t; +uniform lowp float u_pattern_to_t; attribute lowp vec4 a_pattern_to; varying lowp vec4 pattern_to; #else @@ -78,14 +78,14 @@ uniform lowp vec4 u_pattern_to; void main() { #ifndef HAS_UNIFORM_u_base - base = unpack_mix_vec2(a_base, a_base_t); + base = unpack_mix_vec2(a_base, u_base_t); #else lowp float base = u_base; #endif #ifndef HAS_UNIFORM_u_height - height = unpack_mix_vec2(a_height, a_height_t); + height = unpack_mix_vec2(a_height, u_height_t); #else lowp float height = u_height; #endif |