diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-09-07 12:21:22 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-09-07 12:49:32 -0700 |
| commit | 134d1f588ce5e7f901bde5e8529f1810bdc3cfa5 (patch) | |
| tree | bb7152984220b7f522611a177750fae0556cdc58 | |
| parent | f8a53234ffa6ff3fd1d8fc8e3aa8b10b16c815fd (diff) | |
| download | qtlocation-mapboxgl-upstream/z-fighting.tar.gz | |
[core] Fix z-fighting of translucent fillsupstream/z-fighting
| m--------- | mapbox-gl-js | 0 | ||||
| -rw-r--r-- | platform/node/test/ignores.json | 4 | ||||
| -rw-r--r-- | src/mbgl/renderer/layers/render_fill_layer.cpp | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject c48a56be0405453b1f1d7437da82a8af8f201c1 +Subproject db8d5c051cdbf74cf63068494f58488936c7511 diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index f8c3f9c0c8..a8f5a1c7b1 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -36,6 +36,7 @@ "render-tests/line-width/property-function": "https://github.com/mapbox/mapbox-gl-js/issues/3682#issuecomment-264348200", "render-tests/line-join/property-function": "https://github.com/mapbox/mapbox-gl-js/pull/5020", "render-tests/line-join/property-function-dasharray": "https://github.com/mapbox/mapbox-gl-js/pull/5020", + "render-tests/line-opacity/step-curve": "https://github.com/mapbox/mapbox-gl-native/pull/9439", "render-tests/regressions/mapbox-gl-js#2305": "https://github.com/mapbox/mapbox-gl-native/issues/6927", "render-tests/regressions/mapbox-gl-js#3548": "skip - needs issue", "render-tests/regressions/mapbox-gl-js#3682": "https://github.com/mapbox/mapbox-gl-js/issues/3682", @@ -45,6 +46,7 @@ "render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude": "skip - needs issue", "render-tests/runtime-styling/source-add-geojson-inline": "skip - needs issue", "render-tests/symbol-placement/line": "needs issue", + "render-tests/text-font/camera-function": "https://github.com/mapbox/mapbox-gl-native/pull/9439", "render-tests/text-keep-upright/line-placement-true-offset": "https://github.com/mapbox/mapbox-gl-native/issues/9271", "render-tests/text-pitch-alignment/auto-text-rotation-alignment-map": "https://github.com/mapbox/mapbox-gl-native/issues/9732", "render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport": "https://github.com/mapbox/mapbox-gl-native/issues/9732", @@ -55,6 +57,6 @@ "render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map": "https://github.com/mapbox/mapbox-gl-native/issues/9732", "render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport": "https://github.com/mapbox/mapbox-gl-native/issues/9732", "render-tests/text-pitch-scaling/line-half": "https://github.com/mapbox/mapbox-gl-native/issues/9732", - "render-tests/text-size/composite-function-high-base": "https://github.com/mapbox/mapbox-gl-native/issues/8654", + "render-tests/text-size/composite-expression": "https://github.com/mapbox/mapbox-gl-native/pull/9439", "render-tests/video/default": "skip - https://github.com/mapbox/mapbox-gl-native/issues/601" } diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index 394642a50d..22cb9563c1 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -99,7 +99,9 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { && evaluated.get<FillOpacity>().constantOr(0) >= 1.0f) == (parameters.pass == RenderPass::Opaque)) { draw(parameters.programs.fill, gl::Triangles(), - parameters.depthModeForSublayer(1, gl::DepthMode::ReadWrite), + parameters.depthModeForSublayer(1, parameters.pass == RenderPass::Opaque + ? gl::DepthMode::ReadWrite + : gl::DepthMode::ReadOnly), *bucket.triangleIndexBuffer, bucket.triangleSegments); } |