diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp index cf0a71847..29eb71678 100644 --- a/src/mbgl/renderer/paint_property_binder.hpp +++ b/src/mbgl/renderer/paint_property_binder.hpp @@ -269,9 +269,22 @@ class PaintPropertyBinders; template class PaintPropertyBinders> { +private: + template + struct Detail; + + template + struct Detail> { + using Binder = PaintPropertyBinder; + using ZoomInterpolatedAttributeList = TypeList...>; + }; + + template + using Property = Detail; + public: template - using Binder = PaintPropertyBinder; + using Binder = typename Property

::Binder; using Binders = IndexedTuple< TypeList, @@ -299,9 +312,9 @@ public: } template - using Attribute = ZoomInterpolatedAttribute; + using ZoomInterpolatedAttributeList = typename Property

::ZoomInterpolatedAttributeList; - using Attributes = gl::Attributes...>; + using Attributes = typename TypeListConcat...>::template ExpandInto; using AttributeBindings = typename Attributes::Bindings; template diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp index 3d9d7710d..1afc1e573 100644 --- a/src/mbgl/style/paint_property.hpp +++ b/src/mbgl/style/paint_property.hpp @@ -34,6 +34,7 @@ public: static constexpr bool IsDataDriven = true; using Attribute = A; + using Attributes = TypeList; using Uniform = U; };