From 36210fe4e9c68a52dedc90548d90e77cf39a2228 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Sat, 29 Oct 2016 14:51:07 -0700 Subject: [core] Make attribute binding more similar to uniform binding --- src/mbgl/shader/line_pattern_shader.hpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/mbgl/shader/line_pattern_shader.hpp') 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 -#include #include +#include 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 a_pos = { "a_pos", *this }; - gl::Attribute a_data = { "a_data", *this }; - + typename LineAttributes::State attributesState; typename LinePatternUniforms::State uniformsState; }; -- cgit v1.2.1