[core] Make Depth::mask an enum; use Painter::depthForSublayer

mapbox · Oct 14, 2016 · 7dba523 · 7dba523
1 parent c3e9a9c
commit 7dba523
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 14 deletions.
diff --git a/src/mbgl/gl/depth.hpp b/src/mbgl/gl/depth.hpp
@@ -18,12 +18,17 @@ class Depth {
         Always       = 0x0207
     };
 
+    enum Mask : bool {
+        ReadOnly = false,
+        ReadWrite = true
+    };
+
     Function func;
-    bool mask;
+    Mask mask;
     Range<float> range;
 
     static Depth disabled() {
-       return Depth { Always, false, { 0.0, 1.0 } };
+       return Depth { Always, ReadOnly, { 0.0, 1.0 } };
     }
 };
 

diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
@@ -252,7 +252,7 @@ void Painter::renderPass(PaintParameters& parameters,
         } else if (layer.is<CustomLayer>()) {
             MBGL_DEBUG_GROUP(layer.baseImpl->id + " - custom");
             context.resetState();
-            context.setDepth(gl::Depth { gl::Depth::LessEqual, false, depthRangeForSublayer(0) });
+            context.setDepth(depthForSublayer(0, gl::Depth::ReadOnly));
             context.setStencil(gl::Stencil::disabled());
             context.setColor(colorForRenderPass());
             layer.as<CustomLayer>()->impl->render(state);
@@ -277,10 +277,10 @@ mat4 Painter::matrixForTile(const UnwrappedTileID& tileID) {
     return matrix;
 }
 
-Range<float> Painter::depthRangeForSublayer(int n) const {
+gl::Depth Painter::depthForSublayer(uint8_t n, gl::Depth::Mask mask) const {
     float nearDepth = ((1 + currentLayer) * numSublayers + n) * depthEpsilon;
     float farDepth = nearDepth + depthRangeSize;
-    return { nearDepth, farDepth };
+    return gl::Depth { gl::Depth::LessEqual, mask, { nearDepth, farDepth } };
 }
 
 gl::Stencil Painter::stencilForClipping(const ClipID& id) const {

diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
@@ -97,7 +97,7 @@ class Painter : private util::noncopyable {
                     uint32_t i, int8_t increment);
 
     mat4 matrixForTile(const UnwrappedTileID&);
-    Range<float> depthRangeForSublayer(int n) const;
+    gl::Depth depthForSublayer(uint8_t n, gl::Depth::Mask) const;
     gl::Stencil stencilForClipping(const ClipID&) const;
     gl::Color colorForRenderPass() const;
 

diff --git a/src/mbgl/renderer/painter_background.cpp b/src/mbgl/renderer/painter_background.cpp
@@ -29,7 +29,7 @@ void Painter::renderBackground(PaintParameters& parameters, const BackgroundLaye
 
         for (const auto& tileID : util::tileCover(state, state.getIntegerZoom())) {
             context.draw({
-                gl::Depth { gl::Depth::LessEqual, false, depthRangeForSublayer(0) },
+                depthForSublayer(0, gl::Depth::ReadOnly),
                 gl::Stencil::disabled(),
                 colorForRenderPass(),
                 parameters.shaders.fillPattern,
@@ -49,7 +49,7 @@ void Painter::renderBackground(PaintParameters& parameters, const BackgroundLaye
     } else {
         for (const auto& tileID : util::tileCover(state, state.getIntegerZoom())) {
             context.draw({
-                gl::Depth { gl::Depth::LessEqual, false, depthRangeForSublayer(0), },
+                depthForSublayer(0, gl::Depth::ReadOnly),
                 gl::Stencil::disabled(),
                 colorForRenderPass(),
                 parameters.shaders.fill,

diff --git a/src/mbgl/renderer/painter_circle.cpp b/src/mbgl/renderer/painter_circle.cpp
@@ -23,7 +23,7 @@ void Painter::renderCircle(PaintParameters& parameters,
     const CirclePaintProperties& properties = layer.impl->paint;
 
     context.draw({
-        gl::Depth { gl::Depth::LessEqual, false, depthRangeForSublayer(0) },
+        depthForSublayer(0, gl::Depth::ReadOnly),
         frame.mapMode == MapMode::Still
             ? stencilForClipping(tile.clip)
             : gl::Stencil::disabled(),

diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp
@@ -37,7 +37,7 @@ void Painter::renderFill(PaintParameters& parameters,
 
         auto draw = [&] (uint8_t sublayer, auto& shader, const auto& subject) {
             context.draw({
-                gl::Depth { gl::Depth::LessEqual, true, depthRangeForSublayer(sublayer) },
+                depthForSublayer(sublayer, gl::Depth::ReadWrite),
                 stencilForClipping(tile.clip),
                 colorForRenderPass(),
                 shader,
@@ -78,7 +78,7 @@ void Painter::renderFill(PaintParameters& parameters,
     } else {
         auto draw = [&] (uint8_t sublayer, auto& shader, Color outlineColor, const auto& subject) {
             context.draw({
-                gl::Depth { gl::Depth::LessEqual, true, depthRangeForSublayer(sublayer) },
+                depthForSublayer(sublayer, gl::Depth::ReadWrite),
                 stencilForClipping(tile.clip),
                 colorForRenderPass(),
                 shader,

diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
@@ -25,7 +25,7 @@ void Painter::renderLine(PaintParameters& parameters,
 
     auto draw = [&] (auto& shader, auto&& uniformValues) {
         context.draw({
-            gl::Depth { gl::Depth::LessEqual, false, depthRangeForSublayer(0) },
+            depthForSublayer(0, gl::Depth::ReadOnly),
             stencilForClipping(tile.clip),
             colorForRenderPass(),
             shader,

diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp
@@ -55,7 +55,7 @@ void Painter::renderRaster(PaintParameters& parameters,
     context.bindTexture(*bucket.texture, 1, gl::TextureFilter::Linear);
 
     context.draw({
-        gl::Depth { gl::Depth::LessEqual, false, depthRangeForSublayer(0) },
+        depthForSublayer(0, gl::Depth::ReadOnly),
         gl::Stencil::disabled(),
         colorForRenderPass(),
         parameters.shaders.raster,

diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp
@@ -47,7 +47,7 @@ void Painter::renderSymbol(PaintParameters& parameters,
 
         context.draw({
             values_.pitchAlignment == AlignmentType::Map
-                ? gl::Depth { gl::Depth::LessEqual, false, depthRangeForSublayer(0) }
+                ? depthForSublayer(0, gl::Depth::ReadOnly)
                 : gl::Depth::disabled(),
             drawAcrossEdges
                 ? gl::Stencil::disabled()