[core] Combine SpriteAtlas::getPosition with SpriteAtlas::getImage

2017-02-13 16:05:26 -08:00
parent 58de1e15c5
commit d819ece74c
11 changed files with 50 additions and 60 deletions
--- a/src/mbgl/programs/fill_program.cpp
+++ b/src/mbgl/programs/fill_program.cpp
@@ -13,8 +13,8 @@ static_assert(sizeof(FillLayoutVertex) == 4, "expected FillLayoutVertex size");
 FillPatternUniforms::Values
 FillPatternUniforms::values(mat4 matrix,
                            Size framebufferSize,
-                            const SpriteAtlasPosition& a,
-                            const SpriteAtlasPosition& b,
+                            const SpriteAtlasElement& a,
+                            const SpriteAtlasElement& b,
                            const Faded<std::string>& fading,
                            const UnwrappedTileID& tileID,
                            const TransformState& state)