diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-15 13:22:00 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-15 13:22:00 -0700 |
commit | a020e535cac36d69a8939fb7956260d2217c65b4 (patch) | |
tree | 7acef00fd8aa1e85dae8ff5491e40f42659b5fd6 /include/mbgl/gl | |
parent | d48333f26d9111d8f4f8420b477c36cece0d14a5 (diff) | |
download | qtlocation-mapboxgl-a020e535cac36d69a8939fb7956260d2217c65b4.tar.gz |
[core] Add a few conveniences to Color
Diffstat (limited to 'include/mbgl/gl')
-rw-r--r-- | include/mbgl/gl/gl_values.hpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/mbgl/gl/gl_values.hpp b/include/mbgl/gl/gl_values.hpp index 4204ca8e13..0d7d294cf7 100644 --- a/include/mbgl/gl/gl_values.hpp +++ b/include/mbgl/gl/gl_values.hpp @@ -5,6 +5,7 @@ #include <array> #include <mbgl/gl/gl.hpp> +#include <mbgl/util/color.hpp> namespace mbgl { namespace gl { @@ -23,7 +24,7 @@ struct ClearDepth { }; struct ClearColor { - struct Type { GLfloat r, g, b, a; }; + using Type = Color; static const Type Default; inline static void Set(const Type& value) { MBGL_CHECK_ERROR(glClearColor(value.r, value.g, value.b, value.a)); @@ -35,10 +36,6 @@ struct ClearColor { } }; -inline bool operator!=(const ClearColor::Type& a, const ClearColor::Type& b) { - return a.r != b.r || a.g != b.g || a.b != b.b || a.a != b.a; -} - struct ClearStencil { using Type = GLint; static const Type Default; |