summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/image_atlas.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-05-13 17:13:31 -0700
committerKonstantin Käfer <mail@kkaefer.com>2019-05-15 10:55:58 -0700
commit867555b1c9ef51fec23ce77c682cf7d5b5a23c5e (patch)
treede380cbb7f5553282b081dce9202cbe9e502ebe5 /src/mbgl/renderer/image_atlas.hpp
parent1a9e93e8d5fc6fd027160b3126eab03d0809ca69 (diff)
downloadqtlocation-mapboxgl-867555b1c9ef51fec23ce77c682cf7d5b5a23c5e.tar.gz
[core] add gfx::UploadPass, split startRender into prepare and uploadupstream/gfx-refactor-7
Diffstat (limited to 'src/mbgl/renderer/image_atlas.hpp')
-rw-r--r--src/mbgl/renderer/image_atlas.hpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/image_atlas.hpp b/src/mbgl/renderer/image_atlas.hpp
index 080a490ab2..b59153c4a6 100644
--- a/src/mbgl/renderer/image_atlas.hpp
+++ b/src/mbgl/renderer/image_atlas.hpp
@@ -10,8 +10,8 @@
namespace mbgl {
namespace gfx {
- class Texture;
- class Context;
+class UploadPass;
+class Texture;
} // namespace gfx
class ImageManager;
@@ -60,9 +60,9 @@ public:
ImagePositions iconPositions;
ImagePositions patternPositions;
- void patchUpdatedImages(gfx::Context&, gfx::Texture&, const ImageManager&);
+ void patchUpdatedImages(gfx::UploadPass&, gfx::Texture&, const ImageManager&);
private:
- void patchUpdatedImage(gfx::Context&, gfx::Texture&, ImagePosition& position, const ImageManager& imageManager, const std::string& name, uint16_t version);
+ void patchUpdatedImage(gfx::UploadPass&, gfx::Texture&, ImagePosition& position, const ImageManager& imageManager, const std::string& name, uint16_t version);
};
ImageAtlas makeImageAtlas(const ImageMap&, const ImageMap&, const std::unordered_map<std::string, uint32_t>& versionMap);