[core] expand defines for multiple uniforms

1 files changed, 14 insertions, 3 deletions

diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp
index 666334ca5f..96b1f14d3e 100644
--- a/src/mbgl/renderer/paint_property_binder.hpp
+++ b/src/mbgl/renderer/paint_property_binder.hpp
@@ -520,14 +520,25 @@ public:
         return result;
     }
 
+    template <class>
+    struct UniformDefines;
+
+    template <class... Us>
+    struct UniformDefines<TypeList<Us...>> {
+        static void appendDefines(std::vector<std::string>& defines) {
+            util::ignore({
+                (defines.push_back(std::string("#define HAS_UNIFORM_") + Us::name()), 0)...
+            });
+        }
+    };
 
     template <class EvaluatedProperties>
     static std::vector<std::string> defines(const EvaluatedProperties& currentProperties) {
         std::vector<std::string> result;
         util::ignore({
-            (result.push_back(currentProperties.template get<Ps>().isConstant()
-                ? std::string("#define HAS_UNIFORM_") + Ps::Uniform::name()
-                : std::string()), 0)...
+            (currentProperties.template get<Ps>().isConstant()
+                ? UniformDefines<typename Ps::Uniforms>::appendDefines(result)
+                : (void) 0, 0)...
         });
         return result;
     }