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/fill_outline_pattern.cpp | |
| parent | 0ee5d9af79c7d23ec5daa090d7f00b43b825a6e8 (diff) | |
| download | qtlocation-mapboxgl-upstream/generate-shaders.tar.gz | |
[core] Simplify generate-shaders.jsupstream/generate-shaders
We moved the #pragma ⇢ #ifndef logic into gl-js.
Diffstat (limited to 'src/mbgl/shaders/fill_outline_pattern.cpp')
| -rw-r--r-- | src/mbgl/shaders/fill_outline_pattern.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mbgl/shaders/fill_outline_pattern.cpp b/src/mbgl/shaders/fill_outline_pattern.cpp index 68e69c2135..11cddb7d07 100644 --- a/src/mbgl/shaders/fill_outline_pattern.cpp +++ b/src/mbgl/shaders/fill_outline_pattern.cpp @@ -32,14 +32,16 @@ varying lowp float opacity; uniform lowp float u_opacity; #endif -void main() { +void main() { + #ifndef HAS_UNIFORM_u_opacity opacity = unpack_mix_vec2(a_opacity, a_opacity_t); #else lowp float opacity = u_opacity; #endif + gl_Position = u_matrix * vec4(a_pos, 0, 1); v_pos_a = get_pattern_pos(u_pixel_coord_upper, u_pixel_coord_lower, u_scale_a * u_pattern_size_a, u_tile_units_to_pixels, a_pos); @@ -70,12 +72,14 @@ varying lowp float opacity; uniform lowp float u_opacity; #endif -void main() { +void main() { + #ifdef HAS_UNIFORM_u_opacity lowp float opacity = u_opacity; #endif + vec2 imagecoord = mod(v_pos_a, 1.0); vec2 pos = mix(u_pattern_tl_a / u_texsize, u_pattern_br_a / u_texsize, imagecoord); vec4 color1 = texture2D(u_image, pos); |