From 847360fcb8a8cacc2a1cfc8656c0f787b123923d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 21:41:27 +0000 Subject: [PATCH] Drawable Renderer (#1570), [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/mbgl/renderer/layers/render_circle_layer.cpp | 6 ++---- src/mbgl/renderer/layers/render_fill_layer.cpp | 11 +++-------- src/mbgl/renderer/layers/render_raster_layer.cpp | 5 +---- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index 58b681b86..bffbb1ca4 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -408,10 +408,8 @@ void RenderCircleLayer::update(gfx::ShaderRegistry& shaders, buildVertices(); circleBuilder->addVertices(rawVerts, 0, rawVerts.size()); - circleBuilder->setSegments(gfx::Triangles(), - bucket.triangles.vector(), - bucket.segments.data(), - bucket.segments.size()); + circleBuilder->setSegments( + gfx::Triangles(), bucket.triangles.vector(), bucket.segments.data(), bucket.segments.size()); circleBuilder->flush(); diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index b6c69b2bb..b67fb1879 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -502,10 +502,8 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders, outlineBuilder->setShader(outlineShader); outlineBuilder->setVertexAttributes(outlineVertexAttrs); outlineBuilder->addVertices(rawVerts, 0, rawVerts.size()); - outlineBuilder->setSegments(gfx::Lines(2), - bucket.lines.vector(), - bucket.lineSegments.data(), - bucket.lineSegments.size()); + outlineBuilder->setSegments( + gfx::Lines(2), bucket.lines.vector(), bucket.lineSegments.data(), bucket.lineSegments.size()); finish(*outlineBuilder, tileID, interpolateUBO, tileProps); } } else { // FillPattern is defined @@ -569,10 +567,7 @@ void RenderFillLayer::update(gfx::ShaderRegistry& shaders, outlinePatternBuilder->setVertexAttributes(outlineVertexAttrs); outlinePatternBuilder->addVertices(rawVerts, 0, rawVerts.size()); outlinePatternBuilder->setSegments( - gfx::Lines(2), - bucket.lines.vector(), - bucket.lineSegments.data(), - bucket.lineSegments.size()); + gfx::Lines(2), bucket.lines.vector(), bucket.lineSegments.data(), bucket.lineSegments.size()); if (const auto& atlases = tile.getAtlasTextures()) { if (const auto samplerLocation = outlineShader->getSamplerLocation("u_image")) { diff --git a/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp index 30b4ad3d7..91d8dca91 100644 --- a/src/mbgl/renderer/layers/render_raster_layer.cpp +++ b/src/mbgl/renderer/layers/render_raster_layer.cpp @@ -368,10 +368,7 @@ void RenderRasterLayer::update(gfx::ShaderRegistry& shaders, }); builder->addVertices(vertices, 0, vertices.size()); - builder->setSegments(gfx::Triangles(), - bucket.indices.vector(), - bucket.segments.data(), - bucket.segments.size()); + builder->setSegments(gfx::Triangles(), bucket.indices.vector(), bucket.segments.data(), bucket.segments.size()); // attributes {