diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-19 14:02:10 +0100 |
---|---|---|
committer | Alf Watt <alf.watt@mapbox.com> | 2019-03-21 12:25:11 -0700 |
commit | 19d70f5be90fdf1e269b99f0a9e253dcca839cf9 (patch) | |
tree | 66f24099853793af7e6660e3ca1270917e4ebc0f /src/mbgl/programs/gl/fill_extrusion.cpp | |
parent | 3b4291e38c95cf7e3b0900df23d709d4d9ce3b06 (diff) | |
download | qtlocation-mapboxgl-19d70f5be90fdf1e269b99f0a9e253dcca839cf9.tar.gz |
[core] use constexpr string concatenation for uniform/attribute names
Diffstat (limited to 'src/mbgl/programs/gl/fill_extrusion.cpp')
-rw-r--r-- | src/mbgl/programs/gl/fill_extrusion.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/programs/gl/fill_extrusion.cpp b/src/mbgl/programs/gl/fill_extrusion.cpp index 45ebb68dd4..bd26d7afde 100644 --- a/src/mbgl/programs/gl/fill_extrusion.cpp +++ b/src/mbgl/programs/gl/fill_extrusion.cpp @@ -33,7 +33,7 @@ varying vec4 v_color; #ifndef HAS_UNIFORM_u_base -uniform lowp float a_base_t; +uniform lowp float u_base_t; attribute highp vec2 a_base; #else uniform highp float u_base; @@ -41,7 +41,7 @@ uniform highp float u_base; #ifndef HAS_UNIFORM_u_height -uniform lowp float a_height_t; +uniform lowp float u_height_t; attribute highp vec2 a_height; #else uniform highp float u_height; @@ -50,7 +50,7 @@ uniform highp float u_height; #ifndef HAS_UNIFORM_u_color -uniform lowp float a_color_t; +uniform lowp float u_color_t; attribute highp vec4 a_color; #else uniform highp vec4 u_color; @@ -60,21 +60,21 @@ uniform highp vec4 u_color; void main() { #ifndef HAS_UNIFORM_u_base - highp float base = unpack_mix_vec2(a_base, a_base_t); + highp float base = unpack_mix_vec2(a_base, u_base_t); #else highp float base = u_base; #endif #ifndef HAS_UNIFORM_u_height - highp float height = unpack_mix_vec2(a_height, a_height_t); + highp float height = unpack_mix_vec2(a_height, u_height_t); #else highp float height = u_height; #endif #ifndef HAS_UNIFORM_u_color - highp vec4 color = unpack_mix_color(a_color, a_color_t); + highp vec4 color = unpack_mix_color(a_color, u_color_t); #else highp vec4 color = u_color; #endif |