From 49a23db0cb0727cdafbcf3e072250553b62574fb Mon Sep 17 00:00:00 2001 From: Tim Sylvester Date: Mon, 15 May 2023 15:15:19 -0700 Subject: [PATCH] Drawable Renderer (#1570), warnings --- include/mbgl/gfx/vertex_attribute.hpp | 3 +-- src/mbgl/gfx/drawable_builder.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/mbgl/gfx/vertex_attribute.hpp b/include/mbgl/gfx/vertex_attribute.hpp index 52a7d9acb..de5d288d6 100644 --- a/include/mbgl/gfx/vertex_attribute.hpp +++ b/include/mbgl/gfx/vertex_attribute.hpp @@ -85,8 +85,7 @@ public: } return items[i] = value; } - template <> - const ElementType& set(std::size_t i, const ElementType& value) { + const ElementType& setVariant(std::size_t i, const ElementType& value) { if (items.size() < i + 1) { items.resize(std::max(items.size(), i + 1)); } diff --git a/src/mbgl/gfx/drawable_builder.cpp b/src/mbgl/gfx/drawable_builder.cpp index a4049238b..7ec2c8212 100644 --- a/src/mbgl/gfx/drawable_builder.cpp +++ b/src/mbgl/gfx/drawable_builder.cpp @@ -43,7 +43,7 @@ void DrawableBuilder::flush() { vertexAttrs.observeAttributes([&](const std::string& iName, const VertexAttribute& iAttr) { if (auto& drawAttr = drawAttrs->getOrAdd(iName)) { for (std::size_t i = 0; i < impl->vertices.elements(); ++i) { - drawAttr->set(i, iAttr.get(0)); + drawAttr->setVariant(i, iAttr.get(0)); } } });