[core] change approach to stencil clipping to (almost) match JS

mapbox · Apr 29, 2019 · 0816371 · 0816371
1 parent 8f5e1ba
commit 0816371
Show file tree

Hide file tree

Showing 27 changed files with 139 additions and 958 deletions.
diff --git a/src/core-files.json b/src/core-files.json
@@ -4,7 +4,6 @@
         "src/csscolorparser/csscolorparser.cpp",
         "src/mbgl/actor/mailbox.cpp",
         "src/mbgl/actor/scheduler.cpp",
-        "src/mbgl/algorithm/generate_clip_ids.cpp",
         "src/mbgl/annotation/annotation_manager.cpp",
         "src/mbgl/annotation/annotation_source.cpp",
         "src/mbgl/annotation/annotation_tile.cpp",
@@ -280,7 +279,6 @@
         "src/mbgl/tile/vector_tile.cpp",
         "src/mbgl/tile/vector_tile_data.cpp",
         "src/mbgl/util/chrono.cpp",
-        "src/mbgl/util/clip_id.cpp",
         "src/mbgl/util/color.cpp",
         "src/mbgl/util/compression.cpp",
         "src/mbgl/util/constants.cpp",
@@ -495,9 +493,6 @@
     },
     "private_headers": {
         "csscolorparser/csscolorparser.hpp": "src/csscolorparser/csscolorparser.hpp",
-        "mbgl/algorithm/covered_by_children.hpp": "src/mbgl/algorithm/covered_by_children.hpp",
-        "mbgl/algorithm/generate_clip_ids.hpp": "src/mbgl/algorithm/generate_clip_ids.hpp",
-        "mbgl/algorithm/generate_clip_ids_impl.hpp": "src/mbgl/algorithm/generate_clip_ids_impl.hpp",
         "mbgl/algorithm/update_renderables.hpp": "src/mbgl/algorithm/update_renderables.hpp",
         "mbgl/algorithm/update_tile_masks.hpp": "src/mbgl/algorithm/update_tile_masks.hpp",
         "mbgl/annotation/annotation_manager.hpp": "src/mbgl/annotation/annotation_manager.hpp",
@@ -750,7 +745,6 @@
         "mbgl/tile/tile_observer.hpp": "src/mbgl/tile/tile_observer.hpp",
         "mbgl/tile/vector_tile.hpp": "src/mbgl/tile/vector_tile.hpp",
         "mbgl/tile/vector_tile_data.hpp": "src/mbgl/tile/vector_tile_data.hpp",
-        "mbgl/util/clip_id.hpp": "src/mbgl/util/clip_id.hpp",
         "mbgl/util/dtoa.hpp": "src/mbgl/util/dtoa.hpp",
         "mbgl/util/grid_index.hpp": "src/mbgl/util/grid_index.hpp",
         "mbgl/util/hash.hpp": "src/mbgl/util/hash.hpp",

diff --git a/src/mbgl/algorithm/covered_by_children.hpp b/src/mbgl/algorithm/covered_by_children.hpp
diff --git a/src/mbgl/algorithm/generate_clip_ids.cpp b/src/mbgl/algorithm/generate_clip_ids.cpp
diff --git a/src/mbgl/algorithm/generate_clip_ids.hpp b/src/mbgl/algorithm/generate_clip_ids.hpp
diff --git a/src/mbgl/algorithm/generate_clip_ids_impl.hpp b/src/mbgl/algorithm/generate_clip_ids_impl.hpp
diff --git a/src/mbgl/annotation/render_annotation_source.cpp b/src/mbgl/annotation/render_annotation_source.cpp
@@ -3,9 +3,6 @@
 #include <mbgl/renderer/render_tile.hpp>
 #include <mbgl/renderer/paint_parameters.hpp>
 
-#include <mbgl/algorithm/generate_clip_ids.hpp>
-#include <mbgl/algorithm/generate_clip_ids_impl.hpp>
-
 #include <mbgl/layermanager/layer_manager.hpp>
 
 namespace mbgl {
@@ -51,7 +48,6 @@ void RenderAnnotationSource::update(Immutable<style::Source::Impl> baseImpl_,
 }
 
 void RenderAnnotationSource::startRender(PaintParameters& parameters) {
-    parameters.clipIDGenerator.update(tilePyramid.getRenderTiles());
     tilePyramid.startRender(parameters);
 }
 

diff --git a/src/mbgl/gfx/context.hpp b/src/mbgl/gfx/context.hpp
@@ -168,6 +168,8 @@ class Context {
     virtual void visualizeStencilBuffer() = 0;
     virtual void visualizeDepthBuffer(float depthRangeSize) = 0;
 #endif
+
+    virtual void clearStencilBuffer(int32_t) = 0;
 };
 
 } // namespace gfx

diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp
@@ -870,5 +870,10 @@ void Context::visualizeDepthBuffer(const float depthRangeSize) {
 
 #endif
 
+void Context::clearStencilBuffer(const int32_t bits) {
+    MBGL_CHECK_ERROR(glClearStencil(bits));
+    MBGL_CHECK_ERROR(glClear(GL_STENCIL_BUFFER_BIT));
+}
+
 } // namespace gl
 } // namespace mbgl
diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp
@@ -247,6 +247,8 @@ class Context final : public gfx::Context {
     void visualizeStencilBuffer() override;
     void visualizeDepthBuffer(float depthRangeSize) override;
 #endif
+
+    void clearStencilBuffer(int32_t) override;
 };
 
 } // namespace gl

diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp
@@ -103,9 +103,7 @@ void RenderCircleLayer::render(PaintParameters& parameters, RenderSource*) {
             *parameters.renderPass,
             gfx::Triangles(),
             parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly),
-            parameters.mapMode != MapMode::Continuous
-                ? parameters.stencilModeForClipping(tile.clip)
-                : gfx::StencilMode::disabled(),
+            gfx::StencilMode::disabled(),
             parameters.colorModeForRenderPass(),
             gfx::CullFaceMode::disabled(),
             *bucket.indexBuffer,

diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/renderer/layers/render_fill_layer.hpp>
 #include <mbgl/renderer/buckets/fill_bucket.hpp>
 #include <mbgl/renderer/render_tile.hpp>
+#include <mbgl/renderer/render_source.hpp>
 #include <mbgl/renderer/paint_parameters.hpp>
 #include <mbgl/renderer/image_manager.hpp>
 #include <mbgl/programs/programs.hpp>
@@ -73,6 +74,7 @@ bool RenderFillLayer::hasCrossfade() const {
 
 void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) {
     if (unevaluated.get<FillPattern>().isUndefined()) {
+        parameters.renderTileClippingMasks(renderTiles);
         for (const RenderTile& tile : renderTiles) {
             const LayerRenderData* renderData = tile.tile.getLayerRenderData(*baseImpl);
             if (!renderData) {
@@ -115,7 +117,7 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) {
                     *parameters.renderPass,
                     drawMode,
                     depthMode,
-                    parameters.stencilModeForClipping(tile.clip),
+                    parameters.stencilModeForClipping(tile.id),
                     parameters.colorModeForRenderPass(),
                     gfx::CullFaceMode::disabled(),
                     indexBuffer,
@@ -157,6 +159,8 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) {
             return;
         }
 
+        parameters.renderTileClippingMasks(renderTiles);
+
         for (const RenderTile& tile : renderTiles) {
             const LayerRenderData* renderData = tile.tile.getLayerRenderData(*baseImpl);
             if (!renderData) {
@@ -209,7 +213,7 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) {
                     *parameters.renderPass,
                     drawMode,
                     depthMode,
-                    parameters.stencilModeForClipping(tile.clip),
+                    parameters.stencilModeForClipping(tile.id),
                     parameters.colorModeForRenderPass(),
                     gfx::CullFaceMode::disabled(),
                     indexBuffer,