summaryrefslogtreecommitdiff
path: root/src/mbgl/util
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-03-06 18:26:32 +0100
committerKonstantin Käfer <mail@kkaefer.com>2019-03-12 11:03:54 +0100
commita7f151ab487d656340d4ace415abacf9e8cecbf9 (patch)
tree49d4ed12f2cbb8a256f4acbd6603d955f22907a2 /src/mbgl/util
parent2a25270298f358f815b22c87ece74fd3f37a42b5 (diff)
downloadqtlocation-mapboxgl-a7f151ab487d656340d4ace415abacf9e8cecbf9.tar.gz
[core] move Texture to the gfx namespace
Diffstat (limited to 'src/mbgl/util')
-rw-r--r--src/mbgl/util/offscreen_texture.cpp6
-rw-r--r--src/mbgl/util/offscreen_texture.hpp7
2 files changed, 8 insertions, 5 deletions
diff --git a/src/mbgl/util/offscreen_texture.cpp b/src/mbgl/util/offscreen_texture.cpp
index bf42f98ceb..6897732dc4 100644
--- a/src/mbgl/util/offscreen_texture.cpp
+++ b/src/mbgl/util/offscreen_texture.cpp
@@ -44,7 +44,7 @@ public:
return context.readFramebuffer<PremultipliedImage>(size);
}
- gl::Texture& getTexture() {
+ gfx::Texture& getTexture() {
assert(texture);
return *texture;
}
@@ -57,7 +57,7 @@ private:
gl::Context& context;
const Size size;
optional<gl::Framebuffer> framebuffer;
- optional<gl::Texture> texture;
+ optional<gfx::Texture> texture;
gl::Renderbuffer<gl::RenderbufferType::DepthComponent>* depth = nullptr;
const gfx::TextureChannelDataType type;
};
@@ -87,7 +87,7 @@ PremultipliedImage OffscreenTexture::readStillImage() {
return impl->readStillImage();
}
-gl::Texture& OffscreenTexture::getTexture() {
+gfx::Texture& OffscreenTexture::getTexture() {
return impl->getTexture();
}
diff --git a/src/mbgl/util/offscreen_texture.hpp b/src/mbgl/util/offscreen_texture.hpp
index 5dc1ad0c56..9446fabecf 100644
--- a/src/mbgl/util/offscreen_texture.hpp
+++ b/src/mbgl/util/offscreen_texture.hpp
@@ -8,9 +8,12 @@ namespace mbgl {
namespace gl {
class Context;
-class Texture;
} // namespace gl
+namespace gfx {
+class Texture;
+} // namespace gfx
+
class OffscreenTexture {
public:
OffscreenTexture(gl::Context&,
@@ -28,7 +31,7 @@ public:
PremultipliedImage readStillImage();
- gl::Texture& getTexture();
+ gfx::Texture& getTexture();
const Size& getSize() const;