summaryrefslogtreecommitdiff
path: root/src/mbgl/gl
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2017-11-02 16:33:20 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2017-11-02 16:33:20 +0200
commita2120304a881507ed60c3199925946c1df06b44c (patch)
tree1cddff9e95d7a724546e29ce5819b7351bde2763 /src/mbgl/gl
parent688540a44d7977208b606b02376edc7d87854db8 (diff)
downloadqtlocation-mapboxgl-a2120304a881507ed60c3199925946c1df06b44c.tar.gz
Bump Mapbox GL Native
mapbox-gl-native @ 13ec2cc562ce98a089b47dee2987b5e58a0384e2
Diffstat (limited to 'src/mbgl/gl')
-rw-r--r--src/mbgl/gl/context.cpp13
-rw-r--r--src/mbgl/gl/context.hpp3
2 files changed, 5 insertions, 11 deletions
diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp
index e04f134f39..a4f9cead0e 100644
--- a/src/mbgl/gl/context.cpp
+++ b/src/mbgl/gl/context.cpp
@@ -590,33 +590,28 @@ void Context::setDirtyState() {
void Context::clear(optional<mbgl::Color> color,
optional<float> depth,
- optional<int32_t> stencil,
- optional<ColorMode::Mask> colorMask_) {
+ optional<int32_t> stencil) {
GLbitfield mask = 0;
if (color) {
mask |= GL_COLOR_BUFFER_BIT;
clearColor = *color;
- colorMask = colorMask_ ? *colorMask_ : value::ColorMask::Default;
+ colorMask = value::ColorMask::Default;
}
if (depth) {
mask |= GL_DEPTH_BUFFER_BIT;
clearDepth = *depth;
- depthMask = true;
+ depthMask = value::DepthMask::Default;
}
if (stencil) {
mask |= GL_STENCIL_BUFFER_BIT;
clearStencil = *stencil;
- stencilMask = 0xFF;
+ stencilMask = value::StencilMask::Default;
}
MBGL_CHECK_ERROR(glClear(mask));
-
- if (colorMask_) {
- colorMask = value::ColorMask::Default;
- }
}
#if not MBGL_USE_GLES2
diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp
index 2d650e7ecb..528113cbba 100644
--- a/src/mbgl/gl/context.hpp
+++ b/src/mbgl/gl/context.hpp
@@ -146,8 +146,7 @@ public:
void clear(optional<mbgl::Color> color,
optional<float> depth,
- optional<int32_t> stencil,
- optional<ColorMode::Mask> colorMask = value::ColorMask::Default);
+ optional<int32_t> stencil);
void setDrawMode(const Points&);
void setDrawMode(const Lines&);