[core] Convert BucketParameters#layer to a separate parameter
This parameter varies between Buckets, while the others are constant. It makes more sense as an individual parameter.
This commit is contained in:
@@ -6,7 +6,8 @@ namespace mbgl {
|
||||
namespace style {
|
||||
|
||||
void BucketParameters::eachFilteredFeature(const Filter& filter,
|
||||
std::function<void (const GeometryTileFeature&, std::size_t index, const std::string& layerName)> function) {
|
||||
const GeometryTileLayer& layer,
|
||||
std::function<void (const GeometryTileFeature&, std::size_t index, const std::string& layerName)> function) {
|
||||
auto name = layer.getName();
|
||||
for (std::size_t i = 0; !cancelled() && i < layer.featureCount(); i++) {
|
||||
auto feature = layer.getFeature(i);
|
||||
|
||||
@@ -21,14 +21,12 @@ namespace style {
|
||||
class BucketParameters {
|
||||
public:
|
||||
BucketParameters(const OverscaledTileID& tileID_,
|
||||
const GeometryTileLayer& layer_,
|
||||
const std::atomic<bool>& obsolete_,
|
||||
uintptr_t tileUID_,
|
||||
GlyphAtlas& glyphAtlas_,
|
||||
FeatureIndex& featureIndex_,
|
||||
const MapMode mode_)
|
||||
: tileID(tileID_),
|
||||
layer(layer_),
|
||||
obsolete(obsolete_),
|
||||
tileUID(tileUID_),
|
||||
glyphAtlas(glyphAtlas_),
|
||||
@@ -39,10 +37,9 @@ public:
|
||||
return obsolete;
|
||||
}
|
||||
|
||||
void eachFilteredFeature(const Filter&, std::function<void (const GeometryTileFeature&, std::size_t index, const std::string& layerName)>);
|
||||
void eachFilteredFeature(const Filter&, const GeometryTileLayer&, std::function<void (const GeometryTileFeature&, std::size_t index, const std::string& layerName)>);
|
||||
|
||||
const OverscaledTileID& tileID;
|
||||
const GeometryTileLayer& layer;
|
||||
const std::atomic<bool>& obsolete;
|
||||
uintptr_t tileUID;
|
||||
GlyphAtlas& glyphAtlas;
|
||||
|
||||
@@ -59,7 +59,7 @@ public:
|
||||
// Returns true if any paint properties have active transitions.
|
||||
virtual bool evaluate(const PropertyEvaluationParameters&) = 0;
|
||||
|
||||
virtual std::unique_ptr<Bucket> createBucket(BucketParameters&) const = 0;
|
||||
virtual std::unique_ptr<Bucket> createBucket(BucketParameters&, const GeometryTileLayer&) const = 0;
|
||||
|
||||
// Checks whether this layer needs to be rendered in the given render pass.
|
||||
bool hasRenderPass(RenderPass) const;
|
||||
|
||||
@@ -16,7 +16,7 @@ bool BackgroundLayer::Impl::evaluate(const PropertyEvaluationParameters& paramet
|
||||
return paint.hasTransition();
|
||||
}
|
||||
|
||||
std::unique_ptr<Bucket> BackgroundLayer::Impl::createBucket(BucketParameters&) const {
|
||||
std::unique_ptr<Bucket> BackgroundLayer::Impl::createBucket(BucketParameters&, const GeometryTileLayer&) const {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ public:
|
||||
void cascade(const CascadeParameters&) override;
|
||||
bool evaluate(const PropertyEvaluationParameters&) override;
|
||||
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&) const override;
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&, const GeometryTileLayer&) const override;
|
||||
|
||||
BackgroundPaintProperties paint;
|
||||
};
|
||||
|
||||
@@ -21,11 +21,11 @@ bool CircleLayer::Impl::evaluate(const PropertyEvaluationParameters& parameters)
|
||||
return paint.hasTransition();
|
||||
}
|
||||
|
||||
std::unique_ptr<Bucket> CircleLayer::Impl::createBucket(BucketParameters& parameters) const {
|
||||
std::unique_ptr<Bucket> CircleLayer::Impl::createBucket(BucketParameters& parameters, const GeometryTileLayer& layer) const {
|
||||
auto bucket = std::make_unique<CircleBucket>(parameters.mode);
|
||||
|
||||
auto& name = bucketName();
|
||||
parameters.eachFilteredFeature(filter, [&] (const auto& feature, std::size_t index, const std::string& layerName) {
|
||||
parameters.eachFilteredFeature(filter, layer, [&] (const auto& feature, std::size_t index, const std::string& layerName) {
|
||||
auto geometries = feature.getGeometries();
|
||||
bucket->addGeometry(geometries);
|
||||
parameters.featureIndex.insert(geometries, index, layerName, name);
|
||||
|
||||
@@ -15,7 +15,7 @@ public:
|
||||
void cascade(const CascadeParameters&) override;
|
||||
bool evaluate(const PropertyEvaluationParameters&) override;
|
||||
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&) const override;
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&, const GeometryTileLayer&) const override;
|
||||
|
||||
float getQueryRadius() const override;
|
||||
bool queryIntersectsGeometry(
|
||||
|
||||
@@ -67,7 +67,7 @@ bool CustomLayer::Impl::evaluate(const PropertyEvaluationParameters&) {
|
||||
return false;
|
||||
}
|
||||
|
||||
std::unique_ptr<Bucket> CustomLayer::Impl::createBucket(BucketParameters&) const {
|
||||
std::unique_ptr<Bucket> CustomLayer::Impl::createBucket(BucketParameters&, const GeometryTileLayer&) const {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ private:
|
||||
void cascade(const CascadeParameters&) final {}
|
||||
bool evaluate(const PropertyEvaluationParameters&) final;
|
||||
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&) const final;
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&, const GeometryTileLayer&) const final;
|
||||
|
||||
CustomLayerInitializeFunction initializeFn = nullptr;
|
||||
CustomLayerRenderFunction renderFn = nullptr;
|
||||
|
||||
@@ -11,7 +11,7 @@ bool FillExtrusionLayer::Impl::evaluate(const PropertyEvaluationParameters&) {
|
||||
return false;
|
||||
}
|
||||
|
||||
std::unique_ptr<Bucket> FillExtrusionLayer::Impl::createBucket(BucketParameters&) const {
|
||||
std::unique_ptr<Bucket> FillExtrusionLayer::Impl::createBucket(BucketParameters&, const GeometryTileLayer&) const {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ public:
|
||||
void cascade(const CascadeParameters&) override;
|
||||
bool evaluate(const PropertyEvaluationParameters&) override;
|
||||
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&) const override;
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&, const GeometryTileLayer&) const override;
|
||||
|
||||
FillExtrusionPaintProperties paint;
|
||||
};
|
||||
|
||||
@@ -30,11 +30,11 @@ bool FillLayer::Impl::evaluate(const PropertyEvaluationParameters& parameters) {
|
||||
return paint.hasTransition();
|
||||
}
|
||||
|
||||
std::unique_ptr<Bucket> FillLayer::Impl::createBucket(BucketParameters& parameters) const {
|
||||
std::unique_ptr<Bucket> FillLayer::Impl::createBucket(BucketParameters& parameters, const GeometryTileLayer& layer) const {
|
||||
auto bucket = std::make_unique<FillBucket>();
|
||||
|
||||
auto& name = bucketName();
|
||||
parameters.eachFilteredFeature(filter, [&] (const auto& feature, std::size_t index, const std::string& layerName) {
|
||||
parameters.eachFilteredFeature(filter, layer, [&] (const auto& feature, std::size_t index, const std::string& layerName) {
|
||||
auto geometries = feature.getGeometries();
|
||||
bucket->addGeometry(geometries);
|
||||
parameters.featureIndex.insert(geometries, index, layerName, name);
|
||||
|
||||
@@ -15,7 +15,7 @@ public:
|
||||
void cascade(const CascadeParameters&) override;
|
||||
bool evaluate(const PropertyEvaluationParameters&) override;
|
||||
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&) const override;
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&, const GeometryTileLayer&) const override;
|
||||
|
||||
float getQueryRadius() const override;
|
||||
bool queryIntersectsGeometry(
|
||||
|
||||
@@ -26,13 +26,13 @@ bool LineLayer::Impl::evaluate(const PropertyEvaluationParameters& parameters) {
|
||||
return paint.hasTransition();
|
||||
}
|
||||
|
||||
std::unique_ptr<Bucket> LineLayer::Impl::createBucket(BucketParameters& parameters) const {
|
||||
std::unique_ptr<Bucket> LineLayer::Impl::createBucket(BucketParameters& parameters, const GeometryTileLayer& layer) const {
|
||||
auto bucket = std::make_unique<LineBucket>(parameters.tileID.overscaleFactor());
|
||||
|
||||
bucket->layout = layout.evaluate(PropertyEvaluationParameters(parameters.tileID.overscaledZ));
|
||||
|
||||
auto& name = bucketName();
|
||||
parameters.eachFilteredFeature(filter, [&] (const auto& feature, std::size_t index, const std::string& layerName) {
|
||||
parameters.eachFilteredFeature(filter, layer, [&] (const auto& feature, std::size_t index, const std::string& layerName) {
|
||||
auto geometries = feature.getGeometries();
|
||||
bucket->addGeometry(geometries);
|
||||
parameters.featureIndex.insert(geometries, index, layerName, name);
|
||||
|
||||
@@ -15,7 +15,7 @@ public:
|
||||
void cascade(const CascadeParameters&) override;
|
||||
bool evaluate(const PropertyEvaluationParameters&) override;
|
||||
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&) const override;
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&, const GeometryTileLayer&) const override;
|
||||
|
||||
float getQueryRadius() const override;
|
||||
bool queryIntersectsGeometry(
|
||||
|
||||
@@ -16,7 +16,7 @@ bool RasterLayer::Impl::evaluate(const PropertyEvaluationParameters& parameters)
|
||||
return paint.hasTransition();
|
||||
}
|
||||
|
||||
std::unique_ptr<Bucket> RasterLayer::Impl::createBucket(BucketParameters&) const {
|
||||
std::unique_ptr<Bucket> RasterLayer::Impl::createBucket(BucketParameters&, const GeometryTileLayer&) const {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ public:
|
||||
void cascade(const CascadeParameters&) override;
|
||||
bool evaluate(const PropertyEvaluationParameters&) override;
|
||||
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&) const override;
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&, const GeometryTileLayer&) const override;
|
||||
|
||||
RasterPaintProperties paint;
|
||||
};
|
||||
|
||||
@@ -24,12 +24,12 @@ bool SymbolLayer::Impl::evaluate(const PropertyEvaluationParameters& parameters)
|
||||
return paint.hasTransition();
|
||||
}
|
||||
|
||||
std::unique_ptr<Bucket> SymbolLayer::Impl::createBucket(BucketParameters&) const {
|
||||
std::unique_ptr<Bucket> SymbolLayer::Impl::createBucket(BucketParameters&, const GeometryTileLayer&) const {
|
||||
assert(false); // Should be calling createLayout() instead.
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
std::unique_ptr<SymbolLayout> SymbolLayer::Impl::createLayout(BucketParameters& parameters) const {
|
||||
std::unique_ptr<SymbolLayout> SymbolLayer::Impl::createLayout(BucketParameters& parameters, const GeometryTileLayer& layer) const {
|
||||
PropertyEvaluationParameters p(parameters.tileID.overscaledZ);
|
||||
SymbolLayoutProperties::Evaluated evaluated = layout.evaluate(p);
|
||||
|
||||
@@ -60,11 +60,11 @@ std::unique_ptr<SymbolLayout> SymbolLayer::Impl::createLayout(BucketParameters&
|
||||
evaluated.get<TextSize>() = layout.evaluate<TextSize>(PropertyEvaluationParameters(p.z + 1));
|
||||
|
||||
return std::make_unique<SymbolLayout>(id,
|
||||
parameters.layer.getName(),
|
||||
layer.getName(),
|
||||
parameters.tileID.overscaleFactor(),
|
||||
parameters.tileID.overscaledZ,
|
||||
parameters.mode,
|
||||
parameters.layer,
|
||||
layer,
|
||||
filter,
|
||||
evaluated,
|
||||
textMaxSize,
|
||||
|
||||
@@ -49,8 +49,8 @@ public:
|
||||
void cascade(const CascadeParameters&) override;
|
||||
bool evaluate(const PropertyEvaluationParameters&) override;
|
||||
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&) const override;
|
||||
std::unique_ptr<SymbolLayout> createLayout(BucketParameters&) const;
|
||||
std::unique_ptr<Bucket> createBucket(BucketParameters&, const GeometryTileLayer&) const override;
|
||||
std::unique_ptr<SymbolLayout> createLayout(BucketParameters&, const GeometryTileLayer&) const;
|
||||
|
||||
SymbolPropertyValues iconPropertyValues(const SymbolLayoutProperties::Evaluated&) const;
|
||||
SymbolPropertyValues textPropertyValues(const SymbolLayoutProperties::Evaluated&) const;
|
||||
|
||||
@@ -210,6 +210,13 @@ void GeometryTileWorker::redoLayout() {
|
||||
std::unordered_map<std::string, std::unique_ptr<Bucket>> buckets;
|
||||
auto featureIndex = std::make_unique<FeatureIndex>();
|
||||
|
||||
BucketParameters parameters(id,
|
||||
obsolete,
|
||||
reinterpret_cast<uintptr_t>(this),
|
||||
glyphAtlas,
|
||||
*featureIndex,
|
||||
mode);
|
||||
|
||||
for (auto i = layers->rbegin(); i != layers->rend(); i++) {
|
||||
if (obsolete) {
|
||||
return;
|
||||
@@ -235,18 +242,10 @@ void GeometryTileWorker::redoLayout() {
|
||||
continue;
|
||||
}
|
||||
|
||||
BucketParameters parameters(id,
|
||||
*geometryLayer,
|
||||
obsolete,
|
||||
reinterpret_cast<uintptr_t>(this),
|
||||
glyphAtlas,
|
||||
*featureIndex,
|
||||
mode);
|
||||
|
||||
if (layer->is<SymbolLayer>()) {
|
||||
symbolLayouts.push_back(layer->as<SymbolLayer>()->impl->createLayout(parameters));
|
||||
symbolLayouts.push_back(layer->as<SymbolLayer>()->impl->createLayout(parameters, *geometryLayer));
|
||||
} else {
|
||||
std::unique_ptr<Bucket> bucket = layer->baseImpl->createBucket(parameters);
|
||||
std::unique_ptr<Bucket> bucket = layer->baseImpl->createBucket(parameters, *geometryLayer);
|
||||
if (bucket->hasData()) {
|
||||
buckets.emplace(layer->baseImpl->bucketName(), std::move(bucket));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user