diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-28 16:39:50 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-02 09:44:42 -0800 |
| commit | 141e995806576364d185626176c1b993fc519291 (patch) | |
| tree | ecdc41fc7699f2a1a9e9456157348451ebe99597 /src/mbgl/programs/fill_program.cpp | |
| parent | 6a6bddb4537004cc1bfc506e76772de74d33f3f7 (diff) | |
| download | qtlocation-mapboxgl-141e995806576364d185626176c1b993fc519291.tar.gz | |
[core] Add support for data-driven styling
Diffstat (limited to 'src/mbgl/programs/fill_program.cpp')
| -rw-r--r-- | src/mbgl/programs/fill_program.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mbgl/programs/fill_program.cpp b/src/mbgl/programs/fill_program.cpp index a8154d08f9..6998d56232 100644 --- a/src/mbgl/programs/fill_program.cpp +++ b/src/mbgl/programs/fill_program.cpp @@ -8,11 +8,10 @@ namespace mbgl { using namespace style; -static_assert(sizeof(FillAttributes::Vertex) == 4, "expected FillVertex size"); +static_assert(sizeof(FillLayoutVertex) == 4, "expected FillLayoutVertex size"); FillPatternUniforms::Values FillPatternUniforms::values(mat4 matrix, - float opacity, Size framebufferSize, const SpriteAtlasPosition& a, const SpriteAtlasPosition& b, @@ -26,7 +25,6 @@ FillPatternUniforms::values(mat4 matrix, return FillPatternUniforms::Values { uniforms::u_matrix::Value{ matrix }, - uniforms::u_opacity::Value{ opacity }, uniforms::u_world::Value{ framebufferSize }, uniforms::u_pattern_tl_a::Value{ a.tl }, uniforms::u_pattern_br_a::Value{ a.br }, |