diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-02 17:43:51 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-05 10:52:19 -0700 |
commit | e4310aa87489c2db52d7ff65f71e51cc6c9700b6 (patch) | |
tree | 438e67108779aac6f8787ef7b03644534955bf1f /src/mbgl/shader/plain_shader.hpp | |
parent | b9b8657d43aa1172e9ca6be162e915006806ee57 (diff) | |
download | qtlocation-mapboxgl-e4310aa87489c2db52d7ff65f71e51cc6c9700b6.tar.gz |
[core] Improve attribute binding API
Diffstat (limited to 'src/mbgl/shader/plain_shader.hpp')
-rw-r--r-- | src/mbgl/shader/plain_shader.hpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mbgl/shader/plain_shader.hpp b/src/mbgl/shader/plain_shader.hpp index 64cca095d8..b7173d0943 100644 --- a/src/mbgl/shader/plain_shader.hpp +++ b/src/mbgl/shader/plain_shader.hpp @@ -1,23 +1,21 @@ #pragma once #include <mbgl/gl/shader.hpp> +#include <mbgl/gl/attribute.hpp> #include <mbgl/gl/uniform.hpp> #include <mbgl/util/color.hpp> namespace mbgl { -namespace gl { -template <class> class VertexBuffer; -} // namespace gl - class PlainVertex; class PlainShader : public gl::Shader { public: PlainShader(gl::Context&, Defines defines = None); - void bind(const gl::VertexBuffer<PlainVertex>&, - const int8_t* offset); + using VertexType = PlainVertex; + + gl::Attribute<int16_t, 2> a_pos = {"a_pos", *this}; gl::UniformMatrix<4> u_matrix = {"u_matrix", *this}; gl::Uniform<Color> u_color = {"u_color", *this}; |