From 81461bc3574b8a1c3436893309cfb690391ec01d Mon Sep 17 00:00:00 2001
From: Tim Sylvester <tim@wetdogweather.com>
Date: Thu, 11 May 2023 12:18:19 -0700
Subject: [PATCH] Drawable Renderer (#1570), warnings

---
 include/mbgl/util/convert.hpp       | 7 +++++++
 src/mbgl/renderer/renderer_impl.cpp | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/mbgl/util/convert.hpp b/include/mbgl/util/convert.hpp
index 67342ea0d..51e4ff278 100644
--- a/include/mbgl/util/convert.hpp
+++ b/include/mbgl/util/convert.hpp
@@ -14,5 +14,12 @@ MBGL_CONSTEXPR std::array<To, Size> convert(const std::array<From, Size>& from)
     return to;
 }
 
+template <typename To, typename From, std::size_t Size, typename = std::enable_if_t<std::is_assignable_v<To&, From>>>
+MBGL_CONSTEXPR std::array<To, Size> cast(const std::array<From, Size>& from) {
+    std::array<To, Size> to{{}};
+    std::transform(std::begin(from), std::end(from), std::begin(to), [](From x){ return static_cast<To>(x); });
+    return to;
+}
+
 } // namespace util
 } // namespace mbgl
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp
index e1a238fe3..766729c8b 100644
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -241,7 +241,7 @@ void Renderer::Impl::render(const RenderTree& renderTree) {
             }
 
             gfx::DrawableUBO drawableUBO;
-            drawableUBO.matrix = util::convert<float>(matrix);
+            drawableUBO.matrix = util::cast<float>(matrix);
             auto uniformBuffer = context.createUniformBuffer(&drawableUBO, sizeof(drawableUBO));
             drawable.mutableUniformBuffers().addOrReplace("DrawableUBO", uniformBuffer);