diff options
| author | Chris Loer <chris.loer@gmail.com> | 2018-04-19 13:06:42 -0700 |
|---|---|---|
| committer | Chris Loer <chris.loer@mapbox.com> | 2018-04-25 14:39:03 -0700 |
| commit | 60cce56d46cb52c73fcb14d3917c1c47c328b72e (patch) | |
| tree | 9f1bc02f885d0bebc3db27614446530e0f1e8303 /src | |
| parent | a62745edf9ee2da1f6ebda07acfd8260f3696e50 (diff) | |
| download | qtlocation-mapboxgl-60cce56d46cb52c73fcb14d3917c1c47c328b72e.tar.gz | |
Bump GL JS pin to get tests for global symbol querying.
- Pulls over an update to line.vertex.glsl (looks like a no-op?)
- Add test ignores for collator, is-supported-script, line-gradient
- Exclude collator, is-supported-script, line-gradient from code generation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/shaders/line.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mbgl/shaders/line.cpp b/src/mbgl/shaders/line.cpp index c700295a15..68d2dcc468 100644 --- a/src/mbgl/shaders/line.cpp +++ b/src/mbgl/shaders/line.cpp @@ -31,6 +31,7 @@ uniform vec2 u_gl_units_to_pixels; varying vec2 v_normal; varying vec2 v_width2; varying float v_gamma_scale; +varying highp float v_linesofar; #ifndef HAS_UNIFORM_u_color @@ -131,6 +132,8 @@ void main() { vec2 a_extrude = a_data.xy - 128.0; float a_direction = mod(a_data.z, 4.0) - 1.0; + v_linesofar = (floor(a_data.z / 4.0) + a_data.w * 64.0) * 2.0; + vec2 pos = a_pos_normal.xy; // x is 1 if it's a round cap, 0 otherwise |