diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-02-28 12:03:29 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-01 09:33:37 +0100 |
commit | 4372ce2b90a26d114fafa555227a5200c421878f (patch) | |
tree | d3995b51c4fe4d2fea83ea57ce308de0cd24b89c /src/mbgl/renderer | |
parent | 53628a455bba6448579cbb8e8cedf25de28a8b3f (diff) | |
download | qtlocation-mapboxgl-4372ce2b90a26d114fafa555227a5200c421878f.tar.gz |
[core] move StencilMode to gfx namespace
Diffstat (limited to 'src/mbgl/renderer')
-rw-r--r-- | src/mbgl/renderer/layers/render_background_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_circle_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_custom_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_heatmap_layer.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_hillshade_layer.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_raster_layer.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/renderer/paint_parameters.cpp | 12 | ||||
-rw-r--r-- | src/mbgl/renderer/paint_parameters.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/renderer_impl.cpp | 14 | ||||
-rw-r--r-- | src/mbgl/renderer/sources/render_image_source.cpp | 2 |
12 files changed, 30 insertions, 30 deletions
diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp index 21c209d5f0..ce1494f5af 100644 --- a/src/mbgl/renderer/layers/render_background_layer.cpp +++ b/src/mbgl/renderer/layers/render_background_layer.cpp @@ -69,7 +69,7 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) { parameters.context, gfx::Triangles(), parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), - gl::StencilMode::disabled(), + gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), parameters.staticData.quadTriangleIndexBuffer, diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index 1754111335..0a5950637c 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -100,7 +100,7 @@ void RenderCircleLayer::render(PaintParameters& parameters, RenderSource*) { parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), parameters.mapMode != MapMode::Continuous ? parameters.stencilModeForClipping(tile.clip) - : gl::StencilMode::disabled(), + : gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), *bucket.indexBuffer, diff --git a/src/mbgl/renderer/layers/render_custom_layer.cpp b/src/mbgl/renderer/layers/render_custom_layer.cpp index 4880919c36..bff4640549 100644 --- a/src/mbgl/renderer/layers/render_custom_layer.cpp +++ b/src/mbgl/renderer/layers/render_custom_layer.cpp @@ -63,7 +63,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, gfx::DepthMaskType::ReadOnly)); - glContext.setStencilMode(gl::StencilMode::disabled()); + glContext.setStencilMode(gfx::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 5ecd0fb7d4..78ad20d8d1 100644 --- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp @@ -68,7 +68,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* // Flag the depth buffer as no longer needing to be cleared for the remainder of this pass. parameters.staticData.depthRenderbuffer->shouldClear(false); - parameters.context.setStencilMode(gl::StencilMode::disabled()); + parameters.context.setStencilMode(gfx::StencilMode::disabled()); parameters.context.clear(Color{ 0.0f, 0.0f, 0.0f, 0.0f }, depthClearValue, {}); auto draw = [&](auto& programInstance, const auto& tileBucket, auto&& uniformValues, @@ -94,7 +94,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* parameters.context, gfx::Triangles(), parameters.depthModeFor3D(gfx::DepthMaskType::ReadWrite), - gl::StencilMode::disabled(), + gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::backCCW(), *tileBucket.indexBuffer, @@ -195,7 +195,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* parameters.context, gfx::Triangles(), gfx::DepthMode::disabled(), - gl::StencilMode::disabled(), + gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), parameters.staticData.quadTriangleIndexBuffer, diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp index d03cb95261..9a18b35f7f 100644 --- a/src/mbgl/renderer/layers/render_heatmap_layer.cpp +++ b/src/mbgl/renderer/layers/render_heatmap_layer.cpp @@ -93,7 +93,7 @@ void RenderHeatmapLayer::render(PaintParameters& parameters, RenderSource*) { const auto stencilMode = parameters.mapMode != MapMode::Continuous ? parameters.stencilModeForClipping(tile.clip) - : gl::StencilMode::disabled(); + : gfx::StencilMode::disabled(); const auto& paintPropertyBinders = bucket.paintPropertyBinders.at(getID()); @@ -169,7 +169,7 @@ void RenderHeatmapLayer::render(PaintParameters& parameters, RenderSource*) { parameters.context, gfx::Triangles(), gfx::DepthMode::disabled(), - gl::StencilMode::disabled(), + gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), parameters.staticData.quadTriangleIndexBuffer, diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp index 732a0c909c..f492464b4d 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp @@ -98,7 +98,7 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src parameters.context, gfx::Triangles(), parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), - gl::StencilMode::disabled(), + gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), indexBuffer, @@ -159,7 +159,7 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src parameters.context, gfx::Triangles(), parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), - gl::StencilMode::disabled(), + gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), parameters.staticData.quadTriangleIndexBuffer, diff --git a/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp index 494ef0d094..86dd0ca61b 100644 --- a/src/mbgl/renderer/layers/render_raster_layer.cpp +++ b/src/mbgl/renderer/layers/render_raster_layer.cpp @@ -112,7 +112,7 @@ void RenderRasterLayer::render(PaintParameters& parameters, RenderSource* source parameters.context, gfx::Triangles(), parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), - gl::StencilMode::disabled(), + gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), indexBuffer, diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 466e988cd0..f87482fed4 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -120,7 +120,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { values_.pitchAlignment == AlignmentType::Map ? parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly) : gfx::DepthMode::disabled(), - gl::StencilMode::disabled(), + gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), *buffers.indexBuffer, @@ -253,7 +253,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { parameters.context, gfx::Lines { 1.0f }, gfx::DepthMode::disabled(), - gl::StencilMode::disabled(), + gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), CollisionBoxProgram::UniformValues { @@ -288,7 +288,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { parameters.context, gfx::Triangles(), gfx::DepthMode::disabled(), - gl::StencilMode::disabled(), + gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), gl::CullFaceMode::disabled(), CollisionCircleProgram::UniformValues { diff --git a/src/mbgl/renderer/paint_parameters.cpp b/src/mbgl/renderer/paint_parameters.cpp index 0c7ae7a857..2237b016d2 100644 --- a/src/mbgl/renderer/paint_parameters.cpp +++ b/src/mbgl/renderer/paint_parameters.cpp @@ -68,14 +68,14 @@ gfx::DepthMode PaintParameters::depthModeFor3D(gfx::DepthMaskType mask) const { return gfx::DepthMode { gfx::DepthFunctionType::LessEqual, mask, { 0.0, 1.0 } }; } -gl::StencilMode PaintParameters::stencilModeForClipping(const ClipID& id) const { - return gl::StencilMode { - gl::StencilMode::Equal { static_cast<uint32_t>(id.mask.to_ulong()) }, +gfx::StencilMode PaintParameters::stencilModeForClipping(const ClipID& id) const { + return gfx::StencilMode { + gfx::StencilMode::Equal { static_cast<uint32_t>(id.mask.to_ulong()) }, static_cast<int32_t>(id.reference.to_ulong()), 0, - gl::StencilMode::Keep, - gl::StencilMode::Keep, - gl::StencilMode::Replace + gfx::StencilOpType::Keep, + gfx::StencilOpType::Keep, + gfx::StencilOpType::Replace }; } diff --git a/src/mbgl/renderer/paint_parameters.hpp b/src/mbgl/renderer/paint_parameters.hpp index ccfd12b409..ea3b41adfe 100644 --- a/src/mbgl/renderer/paint_parameters.hpp +++ b/src/mbgl/renderer/paint_parameters.hpp @@ -5,7 +5,7 @@ #include <mbgl/renderer/mode.hpp> #include <mbgl/map/mode.hpp> #include <mbgl/gfx/depth_mode.hpp> -#include <mbgl/gl/stencil_mode.hpp> +#include <mbgl/gfx/stencil_mode.hpp> #include <mbgl/gfx/color_mode.hpp> #include <mbgl/util/mat4.hpp> #include <mbgl/algorithm/generate_clip_ids.hpp> @@ -63,7 +63,7 @@ public: gfx::DepthMode depthModeForSublayer(uint8_t n, gfx::DepthMaskType) const; gfx::DepthMode depthModeFor3D(gfx::DepthMaskType) const; - gl::StencilMode stencilModeForClipping(const ClipID&) const; + gfx::StencilMode stencilModeForClipping(const ClipID&) const; gfx::ColorMode colorModeForRenderPass() const; mat4 matrixForTile(const UnwrappedTileID&, bool aligned = false) const; diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index 514d02808e..9575efbb81 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -444,13 +444,13 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { parameters.context, gfx::Triangles(), gfx::DepthMode::disabled(), - gl::StencilMode { - gl::StencilMode::Always(), + gfx::StencilMode { + gfx::StencilMode::Always(), static_cast<int32_t>(clipID.second.reference.to_ulong()), 0b11111111, - gl::StencilMode::Keep, - gl::StencilMode::Keep, - gl::StencilMode::Replace + gfx::StencilOpType::Keep, + gfx::StencilOpType::Keep, + gfx::StencilOpType::Replace }, gfx::ColorMode::disabled(), gl::CullFaceMode::disabled(), @@ -477,7 +477,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { #if not MBGL_USE_GLES2 and not defined(NDEBUG) // Render tile clip boundaries, using stencil buffer to calculate fill color. if (parameters.debugOptions & MapDebugOptions::StencilClip) { - parameters.context.setStencilMode(gl::StencilMode::disabled()); + parameters.context.setStencilMode(gfx::StencilMode::disabled()); parameters.context.setDepthMode(gfx::DepthMode::disabled()); parameters.context.setColorMode(gfx::ColorMode::unblended()); parameters.context.program = 0; @@ -560,7 +560,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { #if not MBGL_USE_GLES2 and not defined(NDEBUG) // Render the depth buffer. if (parameters.debugOptions & MapDebugOptions::DepthBuffer) { - parameters.context.setStencilMode(gl::StencilMode::disabled()); + parameters.context.setStencilMode(gfx::StencilMode::disabled()); parameters.context.setDepthMode(gfx::DepthMode::disabled()); parameters.context.setColorMode(gfx::ColorMode::unblended()); parameters.context.program = 0; diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp index 25fa0ba038..1d1a656363 100644 --- a/src/mbgl/renderer/sources/render_image_source.cpp +++ b/src/mbgl/renderer/sources/render_image_source.cpp @@ -65,7 +65,7 @@ void RenderImageSource::finishRender(PaintParameters& parameters) { parameters.context, gfx::LineStrip { 4.0f * parameters.pixelRatio }, gfx::DepthMode::disabled(), - gl::StencilMode::disabled(), + gfx::StencilMode::disabled(), gfx::ColorMode::unblended(), gl::CullFaceMode::disabled(), parameters.staticData.tileBorderIndexBuffer, |