summaryrefslogtreecommitdiff
path: root/src/mbgl/shader/fill_outline_shader.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/shader/fill_outline_shader.hpp')
-rw-r--r--src/mbgl/shader/fill_outline_shader.hpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mbgl/shader/fill_outline_shader.hpp b/src/mbgl/shader/fill_outline_shader.hpp
index c20bc187d3..4194f7c8c0 100644
--- a/src/mbgl/shader/fill_outline_shader.hpp
+++ b/src/mbgl/shader/fill_outline_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,13 +13,11 @@ public:
FillOutlineShader(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_outline_color = {"u_outline_color", *this};
- gl::Uniform<float> u_opacity = {"u_opacity", *this};
- gl::Uniform<std::array<float, 2>> u_world = {"u_world", *this};
+ typename FillColorUniforms::State uniformsState;
};
} // namespace mbgl