mbgl::variant -> std::variant

maplibre · Apr 17, 2023 · 66c2808 · 66c2808
1 parent 30c220d
commit 66c2808
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/src/mbgl/gfx/color_mode.hpp b/src/mbgl/gfx/color_mode.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
 #include <mbgl/gfx/types.hpp>
-#include <mbgl/util/variant.hpp>
 #include <mbgl/util/color.hpp>
 
+#include <variant>
+
 namespace mbgl {
 namespace gfx {
 
@@ -33,7 +34,7 @@ class ColorMode {
     using Subtract         = LinearBlend<ColorBlendEquationType::Subtract>;
     using ReverseSubtract  = LinearBlend<ColorBlendEquationType::ReverseSubtract>;
 
-    using BlendFunction = variant<
+    using BlendFunction = std::variant<
         Replace,
         Add,
         Subtract,

diff --git a/src/mbgl/gfx/stencil_mode.hpp b/src/mbgl/gfx/stencil_mode.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <mbgl/gfx/types.hpp>
-#include <mbgl/util/variant.hpp>
+
+#include <variant>
 
 namespace mbgl {
 namespace gfx {
@@ -29,7 +30,7 @@ class StencilMode {
     using GreaterEqual = MaskedTest<StencilFunctionType::GreaterEqual>;
     using Always       = SimpleTest<StencilFunctionType::Always>;
 
-    using Test = variant<
+    using Test = std::variant<
         Never,
         Less,
         Equal,

diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp
@@ -9,12 +9,14 @@
 #include <mbgl/gl/command_encoder.hpp>
 #include <mbgl/gl/debugging_extension.hpp>
 #include <mbgl/gl/vertex_array_extension.hpp>
-#include <mbgl/util/traits.hpp>
-#include <mbgl/util/std.hpp>
 #include <mbgl/util/logging.hpp>
+#include <mbgl/util/overloaded.hpp>
+#include <mbgl/util/std.hpp>
+#include <mbgl/util/traits.hpp>
 
 #include <cstring>
 #include <iterator>
+#include <variant>
 
 namespace mbgl {
 namespace gl {
@@ -558,28 +560,28 @@ void Context::setDepthMode(const gfx::DepthMode& depth) {
 }
 
 void Context::setStencilMode(const gfx::StencilMode& stencil) {
-    if (stencil.test.is<gfx::StencilMode::Always>() && !stencil.mask) {
+    if (std::holds_alternative<gfx::StencilMode::Always>(stencil.test) && !stencil.mask) {
         stencilTest = false;
     } else {
         stencilTest = true;
         stencilMask = stencil.mask;
         stencilOp = { stencil.fail, stencil.depthFail, stencil.pass };
-        apply_visitor([&] (const auto& test) {
+        std::visit(util::Overloaded{[&](const auto& test) {
             stencilFunc = { test.func, stencil.ref, test.mask };
-        }, stencil.test);
+        }}, stencil.test);
     }
 }
 
 void Context::setColorMode(const gfx::ColorMode& color) {
-    if (color.blendFunction.is<gfx::ColorMode::Replace>()) {
+    if (std::holds_alternative<gfx::ColorMode::Replace>(color.blendFunction)) {
         blend = false;
     } else {
         blend = true;
         blendColor = color.blendColor;
-        apply_visitor([&] (const auto& blendFunction) {
+        std::visit(util::Overloaded{[&] (const auto& blendFunction) {
             blendEquation = gfx::ColorBlendEquationType(blendFunction.equation);
             blendFunc = { blendFunction.srcFactor, blendFunction.dstFactor };
-        }, color.blendFunction);
+        }}, color.blendFunction);
     }
 
     colorMask = color.mask;

diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp
@@ -10,7 +10,6 @@
 #include <mbgl/renderer/possibly_evaluated_property_value.hpp>
 #include <mbgl/renderer/paint_property_statistics.hpp>
 #include <mbgl/renderer/cross_faded_property_evaluator.hpp>
-#include <mbgl/util/variant.hpp>
 #include <mbgl/renderer/image_atlas.hpp>
 #include <mbgl/util/indexed_tuple.hpp>
 #include <mbgl/layout/pattern_layout.hpp>