diff --git a/src/mbgl/geometry/line_atlas.cpp b/src/mbgl/geometry/line_atlas.cpp index 2042195b6c2..33a78b8ee25 100644 --- a/src/mbgl/geometry/line_atlas.cpp +++ b/src/mbgl/geometry/line_atlas.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include namespace mbgl { @@ -203,15 +204,15 @@ DashPatternTexture::DashPatternTexture(const std::vector& from_, } void DashPatternTexture::upload(gfx::UploadPass& uploadPass) { - if (texture.is()) { - texture = uploadPass.createTexture(texture.get()); + if (std::holds_alternative(texture)) { + texture = uploadPass.createTexture(std::get(texture)); } } gfx::TextureBinding DashPatternTexture::textureBinding() const { // The texture needs to have been uploaded already. - assert(texture.is()); - return {texture.get().getResource(), + assert(std::holds_alternative(texture)); + return {std::get(texture).getResource(), gfx::TextureFilterType::Linear, gfx::TextureMipMapType::No, gfx::TextureWrapType::Repeat, @@ -219,7 +220,7 @@ gfx::TextureBinding DashPatternTexture::textureBinding() const { } Size DashPatternTexture::getSize() const { - return texture.match([](const auto& obj) { return obj.size; }); + return std::visit([](const auto& obj) { return obj.size; }, texture); } LineAtlas::LineAtlas() = default; diff --git a/src/mbgl/geometry/line_atlas.hpp b/src/mbgl/geometry/line_atlas.hpp index 942e1a84b1a..c515c3b3a58 100644 --- a/src/mbgl/geometry/line_atlas.hpp +++ b/src/mbgl/geometry/line_atlas.hpp @@ -2,12 +2,12 @@ #include #include -#include #include #include -#include #include +#include +#include namespace mbgl { @@ -53,7 +53,7 @@ class DashPatternTexture { private: LinePatternPos from, to; - variant texture; + std::variant texture; }; class LineAtlas {