diff options
| author | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-06-19 13:46:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 13:46:12 -0700 |
| commit | 325ad2f711d038876c0180ac1022c265521e9578 (patch) | |
| tree | 0849d47931bb065587cab66842c2c8583383b3df | |
| parent | 4c7842045a231b40aa9f4c4765678f1cd5aa987d (diff) | |
| download | qtlocation-mapboxgl-325ad2f711d038876c0180ac1022c265521e9578.tar.gz | |
[core] port zero line-width fix from gl-js (#12175)
* port zero line-width fix from gl-js
* ignore transition test
* ignore feature-state tests
| m--------- | mapbox-gl-js | 0 | ||||
| -rw-r--r-- | platform/node/test/ignores.json | 6 | ||||
| -rw-r--r-- | src/mbgl/shaders/line.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/shaders/line_pattern.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/shaders/line_sdf.cpp | 2 |
5 files changed, 9 insertions, 3 deletions
diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject a5a8dfe5b90737dbb295eaca7f41c667ae4060a +Subproject 45b0be007cd5df6837e5381e067b9c2a42b7850 diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index ac00235702..05a0497242 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -23,6 +23,10 @@ "query-tests/world-wrapping/box": "skip - needs issue", "query-tests/world-wrapping/point": "skip - needs issue", "query-tests/circle-radius/feature-state": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue", + "query-tests/circle-stroke-width/feature-state": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue", + "query-tests/line-gap-width/feature-state": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue", + "query-tests/line-offset/feature-state": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue", + "query-tests/line-width/feature-state": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue", "query-tests/feature-state/default": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue", "query-tests/regressions/mapbox-gl-js#6555": "skip - no querySourceFeatures in mbgl-node; needs issue", "render-tests/background-color/transition": "https://github.com/mapbox/mapbox-gl-native/issues/10619", @@ -59,6 +63,8 @@ "render-tests/regressions/mapbox-gl-js#5740": "https://github.com/mapbox/mapbox-gl-native/issues/10619", "render-tests/regressions/mapbox-gl-js#5982": "https://github.com/mapbox/mapbox-gl-native/issues/10619", "render-tests/regressions/mapbox-gl-js#6655": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue", + "render-tests/regressions/mapbox-gl-js#6706": "https://github.com/mapbox/mapbox-gl-native/issues/10619", + "render-tests/regressions/mapbox-gl-js#6806": "pending https://github.com/mapbox/mapbox-gl-js/pull/6812", "render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357", "render-tests/runtime-styling/image-add-sdf": "https://github.com/mapbox/mapbox-gl-native/issues/9847", "render-tests/runtime-styling/paint-property-fill-flat-to-extrude": "https://github.com/mapbox/mapbox-gl-native/issues/6745", diff --git a/src/mbgl/shaders/line.cpp b/src/mbgl/shaders/line.cpp index 68d2dcc468..a4df33d9b6 100644 --- a/src/mbgl/shaders/line.cpp +++ b/src/mbgl/shaders/line.cpp @@ -148,7 +148,7 @@ void main() { offset = -1.0 * offset; float inset = gapwidth + (gapwidth > 0.0 ? ANTIALIASING : 0.0); - float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + ANTIALIASING; + float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + (halfwidth == 0.0 ? 0.0 : ANTIALIASING); // Scale the extrusion vector down to a normal and then up by the line width // of this vertex. diff --git a/src/mbgl/shaders/line_pattern.cpp b/src/mbgl/shaders/line_pattern.cpp index be88255e3c..374fc0a995 100644 --- a/src/mbgl/shaders/line_pattern.cpp +++ b/src/mbgl/shaders/line_pattern.cpp @@ -133,7 +133,7 @@ void main() { offset = -1.0 * offset; float inset = gapwidth + (gapwidth > 0.0 ? ANTIALIASING : 0.0); - float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + ANTIALIASING; + float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + (halfwidth == 0.0 ? 0.0 : ANTIALIASING); // Scale the extrusion vector down to a normal and then up by the line width // of this vertex. diff --git a/src/mbgl/shaders/line_sdf.cpp b/src/mbgl/shaders/line_sdf.cpp index c5d50566e8..9b6bf47301 100644 --- a/src/mbgl/shaders/line_sdf.cpp +++ b/src/mbgl/shaders/line_sdf.cpp @@ -171,7 +171,7 @@ void main() { offset = -1.0 * offset; float inset = gapwidth + (gapwidth > 0.0 ? ANTIALIASING : 0.0); - float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + ANTIALIASING; + float outset = gapwidth + halfwidth * (gapwidth > 0.0 ? 2.0 : 1.0) + (halfwidth == 0.0 ? 0.0 : ANTIALIASING); // Scale the extrusion vector down to a normal and then up by the line width // of this vertex. |