diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-13 16:05:26 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-14 16:28:12 -0600 |
| commit | d819ece74c52658c68d4e297c9bef5a74f739e28 (patch) | |
| tree | 3f5af4a976546db7b811522c62c5ab0b504837a2 /src/mbgl/programs/fill_program.hpp | |
| parent | 58de1e15c5e3f4983f445eacefb2fcc931371788 (diff) | |
| download | qtlocation-mapboxgl-d819ece74c52658c68d4e297c9bef5a74f739e28.tar.gz | |
[core] Combine SpriteAtlas::getPosition with SpriteAtlas::getImage
Diffstat (limited to 'src/mbgl/programs/fill_program.hpp')
| -rw-r--r-- | src/mbgl/programs/fill_program.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp index 5406a5999c..84ca2748d6 100644 --- a/src/mbgl/programs/fill_program.hpp +++ b/src/mbgl/programs/fill_program.hpp @@ -16,7 +16,7 @@ namespace mbgl { -class SpriteAtlasPosition; +class SpriteAtlasElement; class UnwrappedTileID; class TransformState; @@ -61,8 +61,8 @@ struct FillPatternUniforms : gl::Uniforms< { static Values values(mat4 matrix, Size framebufferSize, - const SpriteAtlasPosition&, - const SpriteAtlasPosition&, + const SpriteAtlasElement&, + const SpriteAtlasElement&, const style::Faded<std::string>&, const UnwrappedTileID&, const TransformState&); |