From 353d96b5bfe3a32ef2200110308dcbdf9771ce61 Mon Sep 17 00:00:00 2001
From: Tim Sylvester <tim@wetdogweather.com>
Date: Mon, 22 May 2023 15:07:37 -0700
Subject: [PATCH] Drawable Renderer (#1570), Constant binder values weren't
 being converted before being used

---
 src/mbgl/renderer/paint_property_binder.hpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp
index 80d7af55a..5f39d1463 100644
--- a/src/mbgl/renderer/paint_property_binder.hpp
+++ b/src/mbgl/renderer/paint_property_binder.hpp
@@ -167,11 +167,18 @@ public:
         return std::tuple<T>{currentValue.constantOr(constant)};
     }
 
+    using BaseAttributeType = A;
+    using BaseVertex = gfx::VertexType<BaseAttributeType>;
+
     std::size_t getVertexCount() const override { return 1; }
-    const /*std::tuple<ExpandToType<A, T>>&*/ void* getVertexValue(std::size_t) const override { return &constant; }
+    const /*std::tuple<ExpandToType<A, T>>&*/ void* getVertexValue(std::size_t) const override {
+        convertedValue = BaseVertex{attributeValue(constant)};
+        return &convertedValue;
+    }
 
 private:
     T constant;
+    mutable BaseVertex convertedValue;
 };
 
 template <class T, class... As>