diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-08-01 13:03:53 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-08-01 13:04:44 -0700 |
commit | 1b740c41c0dadf62721f4aae52190cebadfb8f8a (patch) | |
tree | 3d0198d95ff5a7d60f1a037d351e0d88e7c17e84 /src/mbgl/shaders/symbol_icon.cpp | |
parent | 0ee5d9af79c7d23ec5daa090d7f00b43b825a6e8 (diff) | |
download | qtlocation-mapboxgl-1b740c41c0dadf62721f4aae52190cebadfb8f8a.tar.gz |
[core] Simplify generate-shaders.jsupstream/generate-shaders
We moved the #pragma ⇢ #ifndef logic into gl-js.
Diffstat (limited to 'src/mbgl/shaders/symbol_icon.cpp')
-rw-r--r-- | src/mbgl/shaders/symbol_icon.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mbgl/shaders/symbol_icon.cpp b/src/mbgl/shaders/symbol_icon.cpp index c0e3a0ac01..1e96194738 100644 --- a/src/mbgl/shaders/symbol_icon.cpp +++ b/src/mbgl/shaders/symbol_icon.cpp @@ -32,6 +32,7 @@ varying lowp float opacity; uniform lowp float u_opacity; #endif + uniform mat4 u_matrix; uniform mat4 u_label_plane_matrix; uniform mat4 u_gl_coord_matrix; @@ -45,13 +46,14 @@ varying vec2 v_tex; varying vec2 v_fade_tex; void main() { - + #ifndef HAS_UNIFORM_u_opacity opacity = unpack_mix_vec2(a_opacity, a_opacity_t); #else lowp float opacity = u_opacity; #endif + vec2 a_pos = a_pos_offset.xy; vec2 a_offset = a_pos_offset.zw; @@ -125,15 +127,17 @@ varying lowp float opacity; uniform lowp float u_opacity; #endif + varying vec2 v_tex; varying vec2 v_fade_tex; void main() { - + #ifdef HAS_UNIFORM_u_opacity lowp float opacity = u_opacity; #endif + lowp float alpha = texture2D(u_fadetexture, v_fade_tex).a * opacity; gl_FragColor = texture2D(u_texture, v_tex) * alpha; |