diff options
Diffstat (limited to 'src/mbgl/geometry/line_atlas.hpp')
-rw-r--r-- | src/mbgl/geometry/line_atlas.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/geometry/line_atlas.hpp b/src/mbgl/geometry/line_atlas.hpp index e76a91b61d..e94b399457 100644 --- a/src/mbgl/geometry/line_atlas.hpp +++ b/src/mbgl/geometry/line_atlas.hpp @@ -1,11 +1,11 @@ #ifndef MBGL_GEOMETRY_LINE_ATLAS #define MBGL_GEOMETRY_LINE_ATLAS -#include <mbgl/platform/gl.hpp> +#include <mbgl/gl/gl.hpp> +#include <mbgl/gl/gl_object_store.hpp> #include <vector> #include <map> -#include <memory> namespace mbgl { @@ -21,14 +21,14 @@ public: ~LineAtlas(); // Binds the atlas texture to the GPU, and uploads data if it is out of date. - void bind(); + void bind(gl::GLObjectStore&); // 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(); + void upload(gl::GLObjectStore&); - LinePatternPos getDashPosition(const std::vector<float>&, bool); - LinePatternPos addDash(const std::vector<float> &dasharray, bool round); + LinePatternPos getDashPosition(const std::vector<float>&, bool, gl::GLObjectStore&); + LinePatternPos addDash(const std::vector<float> &dasharray, bool round, gl::GLObjectStore&); const GLsizei width; const GLsizei height; @@ -36,7 +36,7 @@ public: private: const std::unique_ptr<GLbyte[]> data; bool dirty; - GLuint texture = 0; + gl::TextureHolder texture; int nextRow = 0; std::map<size_t, LinePatternPos> positions; }; |