diff options
Diffstat (limited to 'src/mbgl/renderer/layers')
10 files changed, 20 insertions, 20 deletions
diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp index df22514677..21c209d5f0 100644 --- a/src/mbgl/renderer/layers/render_background_layer.cpp +++ b/src/mbgl/renderer/layers/render_background_layer.cpp @@ -68,7 +68,7 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) { program.draw( parameters.context, gfx::Triangles(), - parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), + parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index 888cc190a3..1754111335 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -97,7 +97,7 @@ void RenderCircleLayer::render(PaintParameters& parameters, RenderSource*) { programInstance.draw( parameters.context, gfx::Triangles(), - parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), + parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), parameters.mapMode != MapMode::Continuous ? parameters.stencilModeForClipping(tile.clip) : gl::StencilMode::disabled(), diff --git a/src/mbgl/renderer/layers/render_custom_layer.cpp b/src/mbgl/renderer/layers/render_custom_layer.cpp index 5ff0f1f812..4880919c36 100644 --- a/src/mbgl/renderer/layers/render_custom_layer.cpp +++ b/src/mbgl/renderer/layers/render_custom_layer.cpp @@ -62,7 +62,7 @@ void RenderCustomLayer::render(PaintParameters& paintParameters, RenderSource*) // Reset GL state to a known state so the CustomLayer always has a clean slate. glContext.bindVertexArray = 0; - glContext.setDepthMode(paintParameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly)); + glContext.setDepthMode(paintParameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly)); glContext.setStencilMode(gl::StencilMode::disabled()); glContext.setColorMode(paintParameters.colorModeForRenderPass()); glContext.setCullFaceMode(gl::CullFaceMode::disabled()); diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp index 0552092f20..5ecd0fb7d4 100644 --- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp @@ -93,7 +93,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* programInstance.draw( parameters.context, gfx::Triangles(), - parameters.depthModeFor3D(gl::DepthMode::ReadWrite), + parameters.depthModeFor3D(gfx::DepthMaskType::ReadWrite), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::backCCW(), @@ -194,7 +194,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* programInstance.draw( parameters.context, gfx::Triangles(), - gl::DepthMode::disabled(), + gfx::DepthMode::disabled(), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index 303120d815..d529831997 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -121,8 +121,8 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { draw(parameters.programs.getFillLayerPrograms().fill, gfx::Triangles(), parameters.depthModeForSublayer(1, parameters.pass == RenderPass::Opaque - ? gl::DepthMode::ReadWrite - : gl::DepthMode::ReadOnly), + ? gfx::DepthMaskType::ReadWrite + : gfx::DepthMaskType::ReadOnly), *bucket.triangleIndexBuffer, bucket.triangleSegments); } @@ -132,7 +132,7 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { gfx::Lines{ 2.0f }, parameters.depthModeForSublayer( unevaluated.get<FillOutlineColor>().isUndefined() ? 2 : 0, - gl::DepthMode::ReadOnly), + gfx::DepthMaskType::ReadOnly), *bucket.lineIndexBuffer, bucket.lineSegments); } @@ -206,14 +206,14 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { draw(parameters.programs.getFillLayerPrograms().fillPattern, gfx::Triangles(), - parameters.depthModeForSublayer(1, gl::DepthMode::ReadWrite), + parameters.depthModeForSublayer(1, gfx::DepthMaskType::ReadWrite), *bucket.triangleIndexBuffer, bucket.triangleSegments); if (evaluated.get<FillAntialias>() && unevaluated.get<FillOutlineColor>().isUndefined()) { draw(parameters.programs.getFillLayerPrograms().fillOutlinePattern, gfx::Lines { 2.0f }, - parameters.depthModeForSublayer(2, gl::DepthMode::ReadOnly), + parameters.depthModeForSublayer(2, gfx::DepthMaskType::ReadOnly), *bucket.lineIndexBuffer, bucket.lineSegments); } diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp index ef0f378022..d03cb95261 100644 --- a/src/mbgl/renderer/layers/render_heatmap_layer.cpp +++ b/src/mbgl/renderer/layers/render_heatmap_layer.cpp @@ -120,7 +120,7 @@ void RenderHeatmapLayer::render(PaintParameters& parameters, RenderSource*) { programInstance.draw( parameters.context, gfx::Triangles(), - parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), + parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), stencilMode, gfx::ColorMode::additive(), gl::CullFaceMode::disabled(), @@ -168,7 +168,7 @@ void RenderHeatmapLayer::render(PaintParameters& parameters, RenderSource*) { programInstance.draw( parameters.context, gfx::Triangles(), - gl::DepthMode::disabled(), + gfx::DepthMode::disabled(), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp index 9b94e5145c..732a0c909c 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp @@ -97,7 +97,7 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src programInstance.draw( parameters.context, gfx::Triangles(), - parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), + parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), @@ -158,7 +158,7 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src programInstance.draw( parameters.context, gfx::Triangles(), - parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), + parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp index 98fedd9bd7..8b303890eb 100644 --- a/src/mbgl/renderer/layers/render_line_layer.cpp +++ b/src/mbgl/renderer/layers/render_line_layer.cpp @@ -88,7 +88,7 @@ void RenderLineLayer::render(PaintParameters& parameters, RenderSource*) { programInstance.draw( parameters.context, gfx::Triangles(), - parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), + parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), parameters.stencilModeForClipping(tile.clip), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), diff --git a/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp index 666a2ab913..494ef0d094 100644 --- a/src/mbgl/renderer/layers/render_raster_layer.cpp +++ b/src/mbgl/renderer/layers/render_raster_layer.cpp @@ -111,7 +111,7 @@ void RenderRasterLayer::render(PaintParameters& parameters, RenderSource* source programInstance.draw( parameters.context, gfx::Triangles(), - parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly), + parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index eb1ae26a8d..466e988cd0 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -118,8 +118,8 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { parameters.context, gfx::Triangles(), values_.pitchAlignment == AlignmentType::Map - ? parameters.depthModeForSublayer(0, gl::DepthMode::ReadOnly) - : gl::DepthMode::disabled(), + ? parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly) + : gfx::DepthMode::disabled(), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), @@ -252,7 +252,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { parameters.programs.getSymbolLayerPrograms().collisionBox.draw( parameters.context, gfx::Lines { 1.0f }, - gl::DepthMode::disabled(), + gfx::DepthMode::disabled(), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), @@ -287,7 +287,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { parameters.programs.getSymbolLayerPrograms().collisionCircle.draw( parameters.context, gfx::Triangles(), - gl::DepthMode::disabled(), + gfx::DepthMode::disabled(), gl::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), |