diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-29 14:51:07 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-11-08 08:09:28 -0800 |
commit | 36210fe4e9c68a52dedc90548d90e77cf39a2228 (patch) | |
tree | be6f8e5c84f98094a372fc7518a5384fd37563bc /src/mbgl/shader/line_pattern_shader.hpp | |
parent | 687ee1e1c92275f65469412591ff262b46e7ccd9 (diff) | |
download | qtlocation-mapboxgl-36210fe4e9c68a52dedc90548d90e77cf39a2228.tar.gz |
[core] Make attribute binding more similar to uniform binding
Diffstat (limited to 'src/mbgl/shader/line_pattern_shader.hpp')
-rw-r--r-- | src/mbgl/shader/line_pattern_shader.hpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mbgl/shader/line_pattern_shader.hpp b/src/mbgl/shader/line_pattern_shader.hpp index 57fb7b6d61..d1013ce4f0 100644 --- a/src/mbgl/shader/line_pattern_shader.hpp +++ b/src/mbgl/shader/line_pattern_shader.hpp @@ -1,23 +1,19 @@ #pragma once #include <mbgl/gl/shader.hpp> -#include <mbgl/gl/attribute.hpp> #include <mbgl/shader/line_uniforms.hpp> +#include <mbgl/shader/line_attributes.hpp> namespace mbgl { -class LineVertex; - class LinePatternShader : public gl::Shader { public: LinePatternShader(gl::Context&, Defines defines = None); - using VertexType = LineVertex; + using AttributesType = LineAttributes; using UniformsType = LinePatternUniforms; - gl::Attribute<int16_t, 2> a_pos = { "a_pos", *this }; - gl::Attribute<uint8_t, 4> a_data = { "a_data", *this }; - + typename LineAttributes::State attributesState; typename LinePatternUniforms::State uniformsState; }; |