Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core] Check if pattern dependencies or pattern positions are missing #14696

Merged
merged 1 commit into from
May 20, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/mbgl/renderer/paint_property_binder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ class CompositeCrossFadedPaintPropertyBinder final : public PaintPropertyBinder<

void populateVertexVector(const GeometryTileFeature&, std::size_t length, const ImagePositions& patternPositions, const optional<PatternDependency>& patternDependencies, const style::expression::Value&) override {

if (patternDependencies->mid.empty()) {
if (!patternDependencies || patternDependencies->mid.empty()) {
// Unlike other propperties with expressions that evaluate to null, the default value for `*-pattern` properties is an empty
// string and will not have a valid entry in patternPositions. We still need to populate the attribute buffers to avoid crashes
// when we try to draw the layer because we don't know at draw time if all features were evaluated to valid pattern dependencies.
Expand Down Expand Up @@ -354,19 +354,29 @@ class CompositeCrossFadedPaintPropertyBinder final : public PaintPropertyBinder<
}

void upload(gfx::UploadPass& uploadPass) override {
patternToVertexBuffer = uploadPass.createVertexBuffer(std::move(patternToVertexVector));
zoomInVertexBuffer = uploadPass.createVertexBuffer(std::move(zoomInVertexVector));
zoomOutVertexBuffer = uploadPass.createVertexBuffer(std::move(zoomOutVertexVector));
if (!patternToVertexVector.empty()) {
assert(!zoomInVertexVector.empty());
assert(!zoomOutVertexVector.empty());
patternToVertexBuffer = uploadPass.createVertexBuffer(std::move(patternToVertexVector));
zoomInVertexBuffer = uploadPass.createVertexBuffer(std::move(zoomInVertexVector));
zoomOutVertexBuffer = uploadPass.createVertexBuffer(std::move(zoomOutVertexVector));
}
}

std::tuple<optional<gfx::AttributeBinding>, optional<gfx::AttributeBinding>> attributeBinding(const PossiblyEvaluatedPropertyValue<Faded<T>>& currentValue) const override {
if (currentValue.isConstant()) {
return {};
} else {
return std::tuple<optional<gfx::AttributeBinding>, optional<gfx::AttributeBinding>>{
gfx::attributeBinding(*patternToVertexBuffer),
gfx::attributeBinding(crossfade.fromScale == 2 ? *zoomInVertexBuffer : *zoomOutVertexBuffer)
};
if (patternToVertexBuffer) {
assert(zoomInVertexBuffer);
assert(zoomOutVertexBuffer);
return std::tuple<optional<gfx::AttributeBinding>, optional<gfx::AttributeBinding>>{
gfx::attributeBinding(*patternToVertexBuffer),
gfx::attributeBinding(crossfade.fromScale == 2 ? *zoomInVertexBuffer : *zoomOutVertexBuffer)
alexshalamov marked this conversation as resolved.
Show resolved Hide resolved
};
}

return std::tuple<optional<gfx::AttributeBinding>, optional<gfx::AttributeBinding>>{{}, {}};
}
}

Expand Down