diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-06 18:26:32 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-12 11:03:54 +0100 |
commit | a7f151ab487d656340d4ace415abacf9e8cecbf9 (patch) | |
tree | 49d4ed12f2cbb8a256f4acbd6603d955f22907a2 /src/mbgl/renderer/image_manager.hpp | |
parent | 2a25270298f358f815b22c87ece74fd3f37a42b5 (diff) | |
download | qtlocation-mapboxgl-a7f151ab487d656340d4ace415abacf9e8cecbf9.tar.gz |
[core] move Texture to the gfx namespace
Diffstat (limited to 'src/mbgl/renderer/image_manager.hpp')
-rw-r--r-- | src/mbgl/renderer/image_manager.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/image_manager.hpp b/src/mbgl/renderer/image_manager.hpp index 103491c58b..e4b251e92b 100644 --- a/src/mbgl/renderer/image_manager.hpp +++ b/src/mbgl/renderer/image_manager.hpp @@ -5,7 +5,7 @@ #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/immutable.hpp> #include <mbgl/util/optional.hpp> -#include <mbgl/gl/texture.hpp> +#include <mbgl/gfx/texture.hpp> #include <mapbox/shelf-pack.hpp> @@ -65,8 +65,8 @@ private: public: optional<ImagePosition> getPattern(const std::string& name); - void bind(gl::Context&, gl::TextureUnit unit); - void upload(gl::Context&, gl::TextureUnit unit); + void bind(gl::Context&, uint8_t unit); + void upload(gl::Context&, uint8_t unit); Size getPixelSize() const; @@ -84,7 +84,7 @@ private: mapbox::ShelfPack shelfPack; std::unordered_map<std::string, Pattern> patterns; PremultipliedImage atlasImage; - mbgl::optional<gl::Texture> atlasTexture; + mbgl::optional<gfx::Texture> atlasTexture; bool dirty = true; }; |