diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-02-28 12:03:29 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-01 09:33:37 +0100 |
| commit | 4372ce2b90a26d114fafa555227a5200c421878f (patch) | |
| tree | d3995b51c4fe4d2fea83ea57ce308de0cd24b89c /src/mbgl/gl/value.hpp | |
| parent | 53628a455bba6448579cbb8e8cedf25de28a8b3f (diff) | |
| download | qtlocation-mapboxgl-4372ce2b90a26d114fafa555227a5200c421878f.tar.gz | |
[core] move StencilMode to gfx namespace
Diffstat (limited to 'src/mbgl/gl/value.hpp')
| -rw-r--r-- | src/mbgl/gl/value.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/gl/value.hpp b/src/mbgl/gl/value.hpp index d7a8ddf6fe..128eff2dce 100644 --- a/src/mbgl/gl/value.hpp +++ b/src/mbgl/gl/value.hpp @@ -2,7 +2,7 @@ #include <mbgl/gl/types.hpp> #include <mbgl/gfx/depth_mode.hpp> -#include <mbgl/gl/stencil_mode.hpp> +#include <mbgl/gfx/stencil_mode.hpp> #include <mbgl/gfx/color_mode.hpp> #include <mbgl/gl/cull_face_mode.hpp> #include <mbgl/gl/attribute.hpp> @@ -62,11 +62,11 @@ struct ColorMask { struct StencilFunc { struct Type { - uint32_t func; + gfx::StencilFunctionType func; int32_t ref; uint32_t mask; }; - static const constexpr Type Default = { StencilMode::Always::func, 0, ~0u }; + static const constexpr Type Default = { gfx::StencilMode::Always::func, 0, ~0u }; static void Set(const Type&); static Type Get(); }; @@ -84,11 +84,11 @@ struct StencilTest { struct StencilOp { struct Type { - StencilMode::Op sfail; - StencilMode::Op dpfail; - StencilMode::Op dppass; + gfx::StencilOpType sfail; + gfx::StencilOpType dpfail; + gfx::StencilOpType dppass; }; - static const constexpr Type Default = { StencilMode::Keep, StencilMode::Keep, StencilMode::Keep }; + static const constexpr Type Default = { gfx::StencilOpType::Keep, gfx::StencilOpType::Keep, gfx::StencilOpType::Keep }; static void Set(const Type&); static Type Get(); }; |