drop symbols and buckets when checks fail

maplibre · Jun 24, 2024 · a601efe · a601efe
1 parent 8fb459a
commit a601efe
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp
@@ -878,9 +878,12 @@ void SymbolLayout::createBucket(const ImagePositions&,
                                                        canonical,
                                                        lastAddedSection);
             }
-            symbolInstance.check(__SOURCE_LOCATION__);
-            assert(lastAddedSection); // True, as hasText == true;
-            updatePaintPropertiesForSection(*bucket, feature, *lastAddedSection, canonical);
+            if (symbolInstance.check(__SOURCE_LOCATION__)) {
+                assert(lastAddedSection); // True, as hasText == true;
+                updatePaintPropertiesForSection(*bucket, feature, *lastAddedSection, canonical);
+            } else {
+                break;
+            }
         }
 
         symbolInstance.releaseSharedData();
@@ -889,14 +892,16 @@ void SymbolLayout::createBucket(const ImagePositions&,
     if (showCollisionBoxes) {
         addToDebugBuffers(*bucket);
     }
-    if (bucket->hasData()){
-        for (const auto& pair : layerPaintProperties) {
-            if (!firstLoad) {
-                bucket->justReloaded = true;
+    if (bucket->hasData()) {
+        if (bucket->check(__SOURCE_LOCATION__)) {
+            for (const auto &pair: layerPaintProperties) {
+                if (!firstLoad) {
+                    bucket->justReloaded = true;
+                }
+                renderData.emplace(pair.first, LayerRenderData{bucket, pair.second});
             }
-            renderData.emplace(pair.first, LayerRenderData{bucket, pair.second});
+            bucket->check(__SOURCE_LOCATION__);
         }
-        bucket->check(__SOURCE_LOCATION__);
     }
 }