diff options
Diffstat (limited to 'src/mbgl/shader/line_sdf_shader.hpp')
| -rw-r--r-- | src/mbgl/shader/line_sdf_shader.hpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/mbgl/shader/line_sdf_shader.hpp b/src/mbgl/shader/line_sdf_shader.hpp index d74e42e50f..b6cced7ae7 100644 --- a/src/mbgl/shader/line_sdf_shader.hpp +++ b/src/mbgl/shader/line_sdf_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/line_uniforms.hpp> namespace mbgl { @@ -14,28 +13,12 @@ public: LineSDFShader(gl::Context&, Defines defines = None); using VertexType = LineVertex; + using UniformsType = LineSDFUniforms; gl::Attribute<int16_t, 2> a_pos = { "a_pos", *this }; gl::Attribute<uint8_t, 4> a_data = { "a_data", *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}; - gl::Uniform<float> u_linewidth = {"u_linewidth", *this}; - gl::Uniform<float> u_gapwidth = {"u_gapwidth", *this}; - gl::Uniform<float> u_antialiasing = {"u_antialiasing", *this}; - gl::Uniform<float> u_ratio = {"u_ratio", *this}; - gl::Uniform<float> u_blur = {"u_blur", *this}; - gl::Uniform<std::array<float, 2>> u_patternscale_a = { "u_patternscale_a", *this}; - gl::Uniform<float> u_tex_y_a = {"u_tex_y_a", *this}; - gl::Uniform<std::array<float, 2>> u_patternscale_b = { "u_patternscale_b", *this}; - gl::Uniform<float> u_tex_y_b = {"u_tex_y_b", *this}; - gl::Uniform<int32_t> u_image = {"u_image", *this}; - gl::Uniform<float> u_sdfgamma = {"u_sdfgamma", *this}; - gl::Uniform<float> u_mix = {"u_mix", *this}; - gl::Uniform<float> u_extra = {"u_extra", *this}; - gl::Uniform<float> u_offset = {"u_offset", *this}; - gl::UniformMatrix<2> u_antialiasingmatrix = {"u_antialiasingmatrix", *this}; + typename LineSDFUniforms::State uniformsState; }; |