diff options
Diffstat (limited to 'src/mbgl/shader/line_pattern_shader.hpp')
| -rw-r--r-- | src/mbgl/shader/line_pattern_shader.hpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/mbgl/shader/line_pattern_shader.hpp b/src/mbgl/shader/line_pattern_shader.hpp index 1bd6085c8b..57fb7b6d61 100644 --- a/src/mbgl/shader/line_pattern_shader.hpp +++ b/src/mbgl/shader/line_pattern_shader.hpp @@ -1,8 +1,8 @@ #pragma once #include <mbgl/gl/shader.hpp> -#include <mbgl/gl/uniform.hpp> #include <mbgl/gl/attribute.hpp> +#include <mbgl/shader/line_uniforms.hpp> namespace mbgl { @@ -13,29 +13,12 @@ public: LinePatternShader(gl::Context&, Defines defines = None); using VertexType = LineVertex; + using UniformsType = LinePatternUniforms; 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<float> u_linewidth = {"u_linewidth", *this}; - gl::Uniform<float> u_gapwidth = {"u_gapwidth", *this}; - gl::Uniform<float> u_antialiasing = {"u_antialiasing", *this}; - gl::Uniform<std::array<float, 2>> u_pattern_size_a = {"u_pattern_size_a", *this}; - gl::Uniform<std::array<float, 2>> u_pattern_tl_a = {"u_pattern_tl_a", *this}; - gl::Uniform<std::array<float, 2>> u_pattern_br_a = {"u_pattern_br_a", *this}; - gl::Uniform<std::array<float, 2>> u_pattern_size_b = {"u_pattern_size_b", *this}; - gl::Uniform<std::array<float, 2>> u_pattern_tl_b = {"u_pattern_tl_b", *this}; - gl::Uniform<std::array<float, 2>> u_pattern_br_b = {"u_pattern_br_b", *this}; - gl::Uniform<float> u_ratio = {"u_ratio", *this}; - gl::Uniform<float> u_point = {"u_point", *this}; - gl::Uniform<float> u_blur = {"u_blur", *this}; - gl::Uniform<float> u_fade = {"u_fade", *this}; - gl::Uniform<float> u_opacity = {"u_opacity", *this}; - gl::Uniform<float> u_extra = {"u_extra", *this}; - gl::Uniform<float> u_offset = {"u_offset", *this}; - gl::Uniform<int32_t> u_image = {"u_image", *this}; - gl::UniformMatrix<2> u_antialiasingmatrix = {"u_antialiasingmatrix", *this}; + typename LinePatternUniforms::State uniformsState; }; } // namespace mbgl |