1 files changed, 35 insertions, 34 deletions

diff --git a/src/mbgl/gl/value.hpp b/src/mbgl/gl/value.hpp
index becf2e63f4..6296d64416 100644
--- a/src/mbgl/gl/value.hpp
+++ b/src/mbgl/gl/value.hpp
@@ -1,8 +1,12 @@
 #pragma once
 
 #include <mbgl/gl/types.hpp>
+#include <mbgl/gl/depth_mode.hpp>
+#include <mbgl/gl/stencil_mode.hpp>
+#include <mbgl/gl/color_mode.hpp>
 #include <mbgl/util/color.hpp>
 #include <mbgl/util/size.hpp>
+#include <mbgl/util/range.hpp>
 
 namespace mbgl {
 namespace gl {
@@ -23,14 +27,14 @@ struct ClearColor {
 };
 
 struct ClearStencil {
-    using Type = StencilValue;
+    using Type = int32_t;
     static const constexpr Type Default = 0;
     static void Set(const Type&);
     static Type Get();
 };
 
 struct StencilMask {
-    using Type = StencilMaskValue;
+    using Type = uint32_t;
     static const constexpr Type Default = ~0u;
     static void Set(const Type&);
     static Type Get();
@@ -44,28 +48,19 @@ struct DepthMask {
 };
 
 struct ColorMask {
-    struct Type {
-        bool r;
-        bool g;
-        bool b;
-        bool a;
-    };
+    using Type = ColorMode::Mask;
     static const constexpr Type Default = { true, true, true, true };
     static void Set(const Type&);
     static Type Get();
 };
 
-constexpr bool operator!=(const ColorMask::Type& a, const ColorMask::Type& b) {
-    return a.r != b.r || a.g != b.g || a.b != b.b || a.a != b.a;
-}
-
 struct StencilFunc {
     struct Type {
-        StencilTestFunction func;
-        StencilValue ref;
-        StencilMaskValue mask;
+        uint32_t func;
+        int32_t ref;
+        uint32_t mask;
     };
-    static const constexpr Type Default = { StencilTestFunction::Always, 0, ~0u };
+    static const constexpr Type Default = { StencilMode::Always::func, 0, ~0u };
     static void Set(const Type&);
     static Type Get();
 };
@@ -83,12 +78,11 @@ struct StencilTest {
 
 struct StencilOp {
     struct Type {
-        StencilTestOperation sfail;
-        StencilTestOperation dpfail;
-        StencilTestOperation dppass;
+        StencilMode::Op sfail;
+        StencilMode::Op dpfail;
+        StencilMode::Op dppass;
     };
-    static const constexpr Type Default = { StencilTestOperation::Keep, StencilTestOperation::Keep,
-                                            StencilTestOperation::Keep };
+    static const constexpr Type Default = { StencilMode::Keep, StencilMode::Keep, StencilMode::Keep };
     static void Set(const Type&);
     static Type Get();
 };
@@ -98,19 +92,12 @@ constexpr bool operator!=(const StencilOp::Type& a, const StencilOp::Type& b) {
 }
 
 struct DepthRange {
-    struct Type {
-        float near;
-        float far;
-    };
+    using Type = Range<float>;
     static const constexpr Type Default = { 0, 1 };
     static void Set(const Type&);
     static Type Get();
 };
 
-constexpr bool operator!=(const DepthRange::Type& a, const DepthRange::Type& b) {
-    return a.near != b.near || a.far != b.far;
-}
-
 struct DepthTest {
     using Type = bool;
     static const constexpr Type Default = false;
@@ -119,8 +106,8 @@ struct DepthTest {
 };
 
 struct DepthFunc {
-    using Type = DepthTestFunction;
-    static const constexpr Type Default = DepthTestFunction::Less;
+    using Type = DepthMode::Function;
+    static const constexpr Type Default = DepthMode::Less;
     static void Set(const Type&);
     static Type Get();
 };
@@ -132,12 +119,19 @@ struct Blend {
     static Type Get();
 };
 
+struct BlendEquation {
+    using Type = ColorMode::BlendEquation;
+    static const constexpr Type Default = ColorMode::BlendEquation::Add;
+    static void Set(const Type&);
+    static Type Get();
+};
+
 struct BlendFunc {
     struct Type {
-        BlendSourceFactor sfactor;
-        BlendDestinationFactor dfactor;
+        ColorMode::BlendFactor sfactor;
+        ColorMode::BlendFactor dfactor;
     };
-    static const constexpr Type Default = { BlendSourceFactor::One, BlendDestinationFactor::Zero };
+    static const constexpr Type Default = { ColorMode::One, ColorMode::Zero };
     static void Set(const Type&);
     static Type Get();
 };
@@ -233,6 +227,13 @@ struct BindVertexArray {
 
 #if not MBGL_USE_GLES2
 
+struct PointSize {
+    using Type = float;
+    static const constexpr Type Default = 1;
+    static void Set(const Type&);
+    static Type Get();
+};
+
 struct PixelZoom {
     struct Type {
         float xfactor;