1 files changed, 3 insertions, 5 deletions
diff --git a/src/mbgl/shader/fill_shader.hpp b/src/mbgl/shader/fill_shader.hpp
index 1240b73aa2..a7f3b8e2f9 100644
--- a/src/mbgl/shader/fill_shader.hpp
+++ b/src/mbgl/shader/fill_shader.hpp
@@ -2,8 +2,7 @@
 
 #include <mbgl/gl/shader.hpp>
 #include <mbgl/gl/attribute.hpp>
-#include <mbgl/gl/uniform.hpp>
-#include <mbgl/util/color.hpp>
+#include <mbgl/shader/fill_uniforms.hpp>
 
 namespace mbgl {
 
@@ -14,12 +13,11 @@ public:
     FillShader(gl::Context&, Defines defines = None);
 
     using VertexType = FillVertex;
+    using UniformsType = FillColorUniforms;
 
     gl::Attribute<int16_t, 2> a_pos = {"a_pos", *this};
 
-    gl::UniformMatrix<4> u_matrix   = {"u_matrix",  *this};
-    gl::Uniform<Color>   u_color    = {"u_color",   *this};
-    gl::Uniform<float>   u_opacity  = {"u_opacity", *this};
+    typename FillColorUniforms::State uniformsState;
 };
 
 } // namespace mbgl