diff options
Diffstat (limited to 'src/mbgl/sprite/sprite_atlas.hpp')
| -rw-r--r-- | src/mbgl/sprite/sprite_atlas.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.hpp b/src/mbgl/sprite/sprite_atlas.hpp index b4ee5ae48c..3a0aea2dad 100644 --- a/src/mbgl/sprite/sprite_atlas.hpp +++ b/src/mbgl/sprite/sprite_atlas.hpp @@ -1,7 +1,6 @@ #pragma once #include <mbgl/geometry/binpack.hpp> -#include <mbgl/gl/gl.hpp> #include <mbgl/gl/object.hpp> #include <mbgl/util/noncopyable.hpp> #include <mbgl/util/optional.hpp> @@ -83,14 +82,14 @@ public: SpritePatternMode mode = SpritePatternMode::Single); // Binds the atlas texture to the GPU, and uploads data if it is out of date. - void bind(bool linear, gl::Context&, uint32_t unit); + void bind(bool linear, gl::Context&, gl::TextureUnit unit); // Updates sprites in the atlas texture that may have changed. void updateDirty(); // Uploads the texture to the GPU to be available when we need it. This is a lazy operation; // the texture is only bound when the data is out of date (=dirty). - void upload(gl::Context&, uint32_t unit); + void upload(gl::Context&, gl::TextureUnit unit); dimension getWidth() const { return width; } dimension getHeight() const { return height; } @@ -105,7 +104,7 @@ private: void _setSprite(const std::string&, const std::shared_ptr<const SpriteImage>& = nullptr); void emitSpriteLoadedIfComplete(); - const GLsizei width, height; + const uint16_t width, height; const dimension pixelWidth, pixelHeight; const float pixelRatio; |