diff options
Diffstat (limited to 'src/mbgl/shader/circle_shader.hpp')
| -rw-r--r-- | src/mbgl/shader/circle_shader.hpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/mbgl/shader/circle_shader.hpp b/src/mbgl/shader/circle_shader.hpp index c2c4053ba4..1c67fd02f3 100644 --- a/src/mbgl/shader/circle_shader.hpp +++ b/src/mbgl/shader/circle_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/circle_uniforms.hpp> namespace mbgl { @@ -14,17 +13,11 @@ public: CircleShader(gl::Context&, Defines defines = None); using VertexType = CircleVertex; + using UniformsType = CircleUniforms; gl::Attribute<int16_t, 2> a_pos = {"a_pos", *this}; - gl::UniformMatrix<4> u_matrix = {"u_matrix", *this}; - gl::Uniform<std::array<float, 2>> u_extrude_scale = {"u_extrude_scale", *this}; - gl::Uniform<float> u_devicepixelratio = {"u_devicepixelratio", *this}; - gl::Uniform<Color> u_color = {"u_color", *this}; - gl::Uniform<float> u_radius = {"u_radius", *this}; - gl::Uniform<float> u_blur = {"u_blur", *this}; - gl::Uniform<float> u_opacity = {"u_opacity", *this}; - gl::Uniform<int32_t> u_scale_with_map = {"u_scale_with_map", *this}; + typename CircleUniforms::State uniformsState; }; } // namespace mbgl |