diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-08-21 15:16:39 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-08-21 15:18:09 +0300 |
| commit | c73ae5014142eb5625bb3b6051a5695d01de6cfa (patch) | |
| tree | 4623e625b6878f0b7ff811fc113727908f91c862 | |
| parent | a059c74a54302f9604f3e3b28143be7645e6204f (diff) | |
| download | qtlocation-mapboxgl-c73ae5014142eb5625bb3b6051a5695d01de6cfa.tar.gz | |
[core] Attempt placement if at least one image is ready
| -rw-r--r-- | platform/node/test/ignores.json | 1 | ||||
| -rw-r--r-- | src/mbgl/tile/geometry_tile_worker.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index 4d4e0edbe4..5e4ba8697d 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -48,7 +48,6 @@ "render-tests/regressions/mapbox-gl-js#4551": "skip - https://github.com/mapbox/mapbox-gl-native/issues/1350", "render-tests/regressions/mapbox-gl-js#4573": "skip - https://github.com/mapbox/mapbox-gl-native/issues/1350", "render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357", - "render-tests/regressions/mapbox-gl-native#9792": "skip - https://github.com/mapbox/mapbox-gl-native/issues/9792", "render-tests/runtime-styling/paint-property-fill-flat-to-extrude": "skip - https://github.com/mapbox/mapbox-gl-native/issues/6745", "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", diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp index add1ea343c..7e1c35bcfb 100644 --- a/src/mbgl/tile/geometry_tile_worker.cpp +++ b/src/mbgl/tile/geometry_tile_worker.cpp @@ -371,7 +371,9 @@ bool GeometryTileWorker::hasPendingSymbolDependencies() const { return true; } } - return !pendingImageDependencies.empty(); + + // Attempt placement if at least one image is ready. + return imageMap.empty() && !pendingImageDependencies.empty(); } void GeometryTileWorker::attemptPlacement() { @@ -398,6 +400,7 @@ void GeometryTileWorker::attemptPlacement() { imageMap, imageAtlas.positions); } + imageMap.clear(); symbolLayoutsNeedPreparation = false; } |