diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-06 17:27:00 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-12 11:03:54 +0100 |
commit | 2a25270298f358f815b22c87ece74fd3f37a42b5 (patch) | |
tree | 37e8e3c08f2531c98c962aba6fdb227ed6212e2c /src/mbgl/gl/texture.hpp | |
parent | 60ceac5efc3d77199f773f08400fe1d53d5a1b90 (diff) | |
download | qtlocation-mapboxgl-2a25270298f358f815b22c87ece74fd3f37a42b5.tar.gz |
[core] move Texture related enums to gfx namespace
Diffstat (limited to 'src/mbgl/gl/texture.hpp')
-rw-r--r-- | src/mbgl/gl/texture.hpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/mbgl/gl/texture.hpp b/src/mbgl/gl/texture.hpp index 625e69233a..1b85ac6ebc 100644 --- a/src/mbgl/gl/texture.hpp +++ b/src/mbgl/gl/texture.hpp @@ -1,5 +1,6 @@ #pragma once +#include <mbgl/gfx/types.hpp> #include <mbgl/gl/object.hpp> #include <mbgl/util/size.hpp> @@ -9,10 +10,10 @@ namespace gl { class Texture { public: Texture(Size size_, UniqueTexture texture_, - TextureFilter filter_ = TextureFilter::Nearest, - TextureMipMap mipmap_ = TextureMipMap::No, - TextureWrap wrapX_ = TextureWrap::Clamp, - TextureWrap wrapY_ = TextureWrap::Clamp) + gfx::TextureFilterType filter_ = gfx::TextureFilterType::Nearest, + gfx::TextureMipMapType mipmap_ = gfx::TextureMipMapType::No, + gfx::TextureWrapType wrapX_ = gfx::TextureWrapType::Clamp, + gfx::TextureWrapType wrapY_ = gfx::TextureWrapType::Clamp) : size(std::move(size_)), texture(std::move(texture_)), filter(filter_), @@ -22,10 +23,10 @@ public: Size size; UniqueTexture texture; - TextureFilter filter; - TextureMipMap mipmap; - TextureWrap wrapX; - TextureWrap wrapY; + gfx::TextureFilterType filter; + gfx::TextureMipMapType mipmap; + gfx::TextureWrapType wrapX; + gfx::TextureWrapType wrapY; }; } // namespace gl |