[core] extract uniform type lists from gl namespace

1 files changed, 4 insertions, 4 deletions

diff --git a/src/mbgl/programs/program.hpp b/src/mbgl/programs/program.hpp
index 7c97727d89..30d226854f 100644
--- a/src/mbgl/programs/program.hpp
+++ b/src/mbgl/programs/program.hpp
@@ -17,7 +17,7 @@ namespace mbgl {
 template <class Shaders,
           class Primitive,
           class LayoutAttrs,
-          class Uniforms,
+          class UniformTypeList,
           class PaintProps>
 class Program {
 public:
@@ -29,9 +29,9 @@ public:
     using PaintAttributes = typename PaintPropertyBinders::Attributes;
     using Attributes = gl::ConcatenateAttributes<LayoutAttributes, PaintAttributes>;
 
-    using UniformValues = typename Uniforms::Values;
-    using PaintUniforms = typename PaintPropertyBinders::Uniforms;
-    using AllUniforms = gl::ConcatenateUniforms<Uniforms, PaintUniforms>;
+    using UniformValues = gfx::UniformValues<UniformTypeList>;
+    using PaintUniformTypeList = typename PaintPropertyBinders::UniformTypeList;
+    using AllUniforms = typename TypeListConcat<UniformTypeList, PaintUniformTypeList>::template ExpandInto<gl::Uniforms>;
 
     using ProgramType = gl::Program<Primitive, Attributes, AllUniforms>;