diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index 68561677e..a2f40aba7 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -547,10 +547,9 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders, patternBuilder->setRenderPass(renderPass); patternBuilder->setVertexAttributes(fillVertexAttrs); patternBuilder->addVertices(rawVerts, 0, rawVerts.size()); - patternBuilder->setSegments( - gfx::Triangles(), - bucket.triangles.vector(), - reinterpret_cast&>(bucket.triangleSegments)); + patternBuilder->setSegments(gfx::Triangles(), + bucket.triangles.vector(), + reinterpret_cast&>(bucket.triangleSegments)); if (const auto& atlases = tile.getAtlasTextures()) { if (const auto samplerLocation = fillShader->getSamplerLocation("u_image")) { diff --git a/src/mbgl/renderer/possibly_evaluated_property_value.hpp b/src/mbgl/renderer/possibly_evaluated_property_value.hpp index d59e4cc01..747b63532 100644 --- a/src/mbgl/renderer/possibly_evaluated_property_value.hpp +++ b/src/mbgl/renderer/possibly_evaluated_property_value.hpp @@ -24,8 +24,7 @@ public: bool isConstant() const { return value.template is(); } std::optional constant() const { - return value.match([&](const T& t) { return std::optional(t); }, - [&](const auto&) { return std::nullopt; }); + return value.match([&](const T& t) { return std::optional(t); }, [&](const auto&) { return std::nullopt; }); } T constantOr(const T& t) const { return constant().value_or(t); }