diff options
Diffstat (limited to 'src/mbgl/shader/symbol_sdf_shader.hpp')
| -rw-r--r-- | src/mbgl/shader/symbol_sdf_shader.hpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/mbgl/shader/symbol_sdf_shader.hpp b/src/mbgl/shader/symbol_sdf_shader.hpp index 8d3b3df939..b7c12811c0 100644 --- a/src/mbgl/shader/symbol_sdf_shader.hpp +++ b/src/mbgl/shader/symbol_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/symbol_uniforms.hpp> namespace mbgl { @@ -14,27 +13,14 @@ public: SymbolSDFShader(gl::Context&, Defines defines = None); using VertexType = SymbolVertex; + using UniformsType = SymbolSDFUniforms; gl::Attribute<int16_t, 2> a_pos = { "a_pos", *this }; gl::Attribute<int16_t, 2> a_offset = { "a_offset", *this }; gl::Attribute<uint16_t, 2> a_texture_pos = { "a_texture_pos", *this }; gl::Attribute<uint8_t, 4> a_data = { "a_data", *this }; - gl::UniformMatrix<4> u_matrix = {"u_matrix", *this}; - gl::Uniform<std::array<float, 2>> u_extrude_scale = {"u_extrude_scale", *this}; - gl::Uniform<Color> u_color = {"u_color", *this}; - gl::Uniform<float> u_opacity = {"u_opacity", *this}; - gl::Uniform<std::array<float, 2>> u_texsize = {"u_texsize", *this}; - gl::Uniform<float> u_buffer = {"u_buffer", *this}; - gl::Uniform<float> u_gamma = {"u_gamma", *this}; - gl::Uniform<float> u_zoom = {"u_zoom", *this}; - gl::Uniform<float> u_pitch = {"u_pitch", *this}; - gl::Uniform<float> u_bearing = {"u_bearing", *this}; - gl::Uniform<float> u_aspect_ratio = {"u_aspect_ratio", *this}; - gl::Uniform<int32_t> u_rotate_with_map = {"u_rotate_with_map", *this}; - gl::Uniform<int32_t> u_pitch_with_map = {"u_pitch_with_map", *this}; - gl::Uniform<int32_t> u_texture = {"u_texture", *this}; - gl::Uniform<int32_t> u_fadetexture = {"u_fadetexture", *this}; + typename SymbolSDFUniforms::State uniformsState; }; } // namespace mbgl |