diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-17 18:19:48 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-23 12:59:27 -0700 |
| commit | 71c8f6aa10368084bc0a365b15f004d0629a8b67 (patch) | |
| tree | 14f22e8b37c0ca5112f5c4cefe34e72882dee3b7 /src/mbgl/programs/fill_program.cpp | |
| parent | 72b13cef6a83594b15f47bfeaee782504def619e (diff) | |
| download | qtlocation-mapboxgl-71c8f6aa10368084bc0a365b15f004d0629a8b67.tar.gz | |
[core] Move pattern coordinate division by texture size into shader
This makes pattern usage more like icons, and will be necessary for data-driven *-pattern properties.
Diffstat (limited to 'src/mbgl/programs/fill_program.cpp')
| -rw-r--r-- | src/mbgl/programs/fill_program.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mbgl/programs/fill_program.cpp b/src/mbgl/programs/fill_program.cpp index 4310f01164..13f7b00e35 100644 --- a/src/mbgl/programs/fill_program.cpp +++ b/src/mbgl/programs/fill_program.cpp @@ -13,6 +13,7 @@ static_assert(sizeof(FillLayoutVertex) == 4, "expected FillLayoutVertex size"); FillPatternUniforms::Values FillPatternUniforms::values(mat4 matrix, Size framebufferSize, + Size atlasSize, const SpriteAtlasElement& a, const SpriteAtlasElement& b, const Faded<std::string>& fading, @@ -26,6 +27,7 @@ FillPatternUniforms::values(mat4 matrix, return FillPatternUniforms::Values { uniforms::u_matrix::Value{ matrix }, uniforms::u_world::Value{ framebufferSize }, + uniforms::u_texsize::Value{ atlasSize }, uniforms::u_pattern_tl_a::Value{ a.tl }, uniforms::u_pattern_br_a::Value{ a.br }, uniforms::u_pattern_tl_b::Value{ b.tl }, |