From 0a6b60a8920648d6e98a46d573f4bc2d78b4293e Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Tue, 7 May 2019 14:13:16 +0300 Subject: [core] Remove clipping option from RenderTile and style::Layer --- include/mbgl/style/layer.hpp | 6 ------ src/mbgl/renderer/render_tile.hpp | 1 - src/mbgl/renderer/tile_pyramid.cpp | 1 - src/mbgl/style/layers/background_layer.cpp | 1 - src/mbgl/style/layers/circle_layer.cpp | 1 - src/mbgl/style/layers/custom_layer.cpp | 1 - src/mbgl/style/layers/fill_extrusion_layer.cpp | 1 - src/mbgl/style/layers/fill_layer.cpp | 1 - src/mbgl/style/layers/heatmap_layer.cpp | 1 - src/mbgl/style/layers/hillshade_layer.cpp | 1 - src/mbgl/style/layers/layer.cpp.ejs | 2 -- src/mbgl/style/layers/line_layer.cpp | 1 - src/mbgl/style/layers/raster_layer.cpp | 1 - src/mbgl/style/layers/symbol_layer.cpp | 1 - 14 files changed, 20 deletions(-) diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp index ab98d978ac..97df299899 100644 --- a/include/mbgl/style/layer.hpp +++ b/include/mbgl/style/layer.hpp @@ -44,12 +44,6 @@ struct LayerTypeInfo { */ const enum class Layout { Required, NotRequired } layout; - /** - * @brief contains \c Clipping::Required if the corresponding layer type - * requires clipping. Contains \c Clipping::NotRequired otherwise. - */ - const enum class Clipping { Required, NotRequired } clipping; - /** * @brief contains \c FadingTiles::Required if the corresponding layer type * requires rendering on fading tiles. Contains \c FadingTiles::NotRequired otherwise. diff --git a/src/mbgl/renderer/render_tile.hpp b/src/mbgl/renderer/render_tile.hpp index ddfcaa8d4d..dbdae097ee 100644 --- a/src/mbgl/renderer/render_tile.hpp +++ b/src/mbgl/renderer/render_tile.hpp @@ -26,7 +26,6 @@ public: mat4 matrix; mat4 nearClippedMatrix; bool used = false; - bool needsClipping = false; mat4 translatedMatrix(const std::array& translate, style::TranslateAnchorType anchor, diff --git a/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp index 37925a54b7..9c73361cb0 100644 --- a/src/mbgl/renderer/tile_pyramid.cpp +++ b/src/mbgl/renderer/tile_pyramid.cpp @@ -255,7 +255,6 @@ void TilePyramid::update(const std::vector>& l : static_cast(tile.getBucket(*layerProperties->baseImpl)); if (layerRenderableInTile) { renderTile.used = true; - renderTile.needsClipping = (renderTile.needsClipping || typeInfo->clipping == LayerTypeInfo::Clipping::Required); } } } diff --git a/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp index 76256b8d30..c0350e2545 100644 --- a/src/mbgl/style/layers/background_layer.cpp +++ b/src/mbgl/style/layers/background_layer.cpp @@ -23,7 +23,6 @@ const LayerTypeInfo* BackgroundLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::NotRequired, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired, LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; diff --git a/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp index a95193d651..5d2cbb69d7 100644 --- a/src/mbgl/style/layers/circle_layer.cpp +++ b/src/mbgl/style/layers/circle_layer.cpp @@ -23,7 +23,6 @@ const LayerTypeInfo* CircleLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired, LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; diff --git a/src/mbgl/style/layers/custom_layer.cpp b/src/mbgl/style/layers/custom_layer.cpp index ba818d953d..bf6db929c5 100644 --- a/src/mbgl/style/layers/custom_layer.cpp +++ b/src/mbgl/style/layers/custom_layer.cpp @@ -13,7 +13,6 @@ namespace { LayerTypeInfo::Source::NotRequired, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired, LayerTypeInfo::FadingTiles::NotRequired }; } // namespace diff --git a/src/mbgl/style/layers/fill_extrusion_layer.cpp b/src/mbgl/style/layers/fill_extrusion_layer.cpp index d477bf7262..5112538c3f 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer.cpp +++ b/src/mbgl/style/layers/fill_extrusion_layer.cpp @@ -23,7 +23,6 @@ const LayerTypeInfo* FillExtrusionLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::Required, LayerTypeInfo::Layout::Required, - LayerTypeInfo::Clipping::NotRequired, LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; diff --git a/src/mbgl/style/layers/fill_layer.cpp b/src/mbgl/style/layers/fill_layer.cpp index f35f62fb1d..a3adb1cf01 100644 --- a/src/mbgl/style/layers/fill_layer.cpp +++ b/src/mbgl/style/layers/fill_layer.cpp @@ -23,7 +23,6 @@ const LayerTypeInfo* FillLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::Required, - LayerTypeInfo::Clipping::Required, LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; diff --git a/src/mbgl/style/layers/heatmap_layer.cpp b/src/mbgl/style/layers/heatmap_layer.cpp index e13089bfd5..a0582a7ea9 100644 --- a/src/mbgl/style/layers/heatmap_layer.cpp +++ b/src/mbgl/style/layers/heatmap_layer.cpp @@ -23,7 +23,6 @@ const LayerTypeInfo* HeatmapLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::Required, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired, LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; diff --git a/src/mbgl/style/layers/hillshade_layer.cpp b/src/mbgl/style/layers/hillshade_layer.cpp index 558022eea8..f448233e28 100644 --- a/src/mbgl/style/layers/hillshade_layer.cpp +++ b/src/mbgl/style/layers/hillshade_layer.cpp @@ -23,7 +23,6 @@ const LayerTypeInfo* HillshadeLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::Required, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired, LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; diff --git a/src/mbgl/style/layers/layer.cpp.ejs b/src/mbgl/style/layers/layer.cpp.ejs index dac4529d39..94650eba20 100644 --- a/src/mbgl/style/layers/layer.cpp.ejs +++ b/src/mbgl/style/layers/layer.cpp.ejs @@ -25,7 +25,6 @@ let layerCapabilities = {}; let defaults = { caps: { 'Source': 'NotRequired', 'Pass3D': 'NotRequired', 'Layout': 'NotRequired', - 'Clipping': 'NotRequired', 'FadingTiles': 'NotRequired' }, require: function(cap) { @@ -45,7 +44,6 @@ let defaults = { caps: { 'Source': 'NotRequired', layerCapabilities['background'] = defaults.finalize(); layerCapabilities['fill'] = defaults.require('Source') .require('Layout') - .require('Clipping') .finalize(); layerCapabilities['fill-extrusion'] = defaults.require('Source') .require('Pass3D') diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp index 0a6f0824f4..2efd424b2c 100644 --- a/src/mbgl/style/layers/line_layer.cpp +++ b/src/mbgl/style/layers/line_layer.cpp @@ -23,7 +23,6 @@ const LayerTypeInfo* LineLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::Required, - LayerTypeInfo::Clipping::Required, LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp index b364870cff..af2c56cbae 100644 --- a/src/mbgl/style/layers/raster_layer.cpp +++ b/src/mbgl/style/layers/raster_layer.cpp @@ -23,7 +23,6 @@ const LayerTypeInfo* RasterLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired, LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp index 1740e5bb2e..3f3dc86b71 100644 --- a/src/mbgl/style/layers/symbol_layer.cpp +++ b/src/mbgl/style/layers/symbol_layer.cpp @@ -23,7 +23,6 @@ const LayerTypeInfo* SymbolLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::Required, - LayerTypeInfo::Clipping::NotRequired, LayerTypeInfo::FadingTiles::Required }; return &typeInfo; -- cgit v1.2.1