diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-02-28 12:31:54 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-01 09:33:37 +0100 |
commit | 67a9dc35bf0c0113d429161be2c125e75981fb5d (patch) | |
tree | 0a11064acec035b62a9d51f8661341719f276ef8 /src/mbgl/renderer | |
parent | 4372ce2b90a26d114fafa555227a5200c421878f (diff) | |
download | qtlocation-mapboxgl-67a9dc35bf0c0113d429161be2c125e75981fb5d.tar.gz |
[core] move CullFaceMode 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 | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_fill_layer.cpp | 4 | ||||
-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_line_layer.cpp | 2 | ||||
-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/render_tile.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/renderer/renderer_impl.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/sources/render_image_source.cpp | 2 |
13 files changed, 21 insertions, 21 deletions
diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp index ce1494f5af..7494e01446 100644 --- a/src/mbgl/renderer/layers/render_background_layer.cpp +++ b/src/mbgl/renderer/layers/render_background_layer.cpp @@ -71,7 +71,7 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) { parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), parameters.staticData.quadTriangleIndexBuffer, parameters.staticData.tileTriangleSegments, allUniformValues, diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index 0a5950637c..10f38a3413 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -102,7 +102,7 @@ void RenderCircleLayer::render(PaintParameters& parameters, RenderSource*) { ? parameters.stencilModeForClipping(tile.clip) : gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), *bucket.indexBuffer, bucket.segments, allUniformValues, diff --git a/src/mbgl/renderer/layers/render_custom_layer.cpp b/src/mbgl/renderer/layers/render_custom_layer.cpp index bff4640549..5eef5d2cb1 100644 --- a/src/mbgl/renderer/layers/render_custom_layer.cpp +++ b/src/mbgl/renderer/layers/render_custom_layer.cpp @@ -65,7 +65,7 @@ void RenderCustomLayer::render(PaintParameters& paintParameters, RenderSource*) glContext.setDepthMode(paintParameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly)); glContext.setStencilMode(gfx::StencilMode::disabled()); glContext.setColorMode(paintParameters.colorModeForRenderPass()); - glContext.setCullFaceMode(gl::CullFaceMode::disabled()); + glContext.setCullFaceMode(gfx::CullFaceMode::disabled()); CustomLayerRenderParameters parameters; diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp index 78ad20d8d1..2753fcd533 100644 --- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp @@ -96,7 +96,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* parameters.depthModeFor3D(gfx::DepthMaskType::ReadWrite), gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), - gl::CullFaceMode::backCCW(), + gfx::CullFaceMode::backCCW(), *tileBucket.indexBuffer, tileBucket.triangleSegments, allUniformValues, @@ -197,7 +197,7 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* gfx::DepthMode::disabled(), gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), parameters.staticData.quadTriangleIndexBuffer, parameters.staticData.extrusionTextureSegments, allUniformValues, diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index d529831997..226c8a11b7 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -105,7 +105,7 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { depthMode, parameters.stencilModeForClipping(tile.clip), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), indexBuffer, segments, allUniformValues, @@ -195,7 +195,7 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { depthMode, parameters.stencilModeForClipping(tile.clip), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), indexBuffer, segments, allUniformValues, diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp index 9a18b35f7f..a3a9a67de5 100644 --- a/src/mbgl/renderer/layers/render_heatmap_layer.cpp +++ b/src/mbgl/renderer/layers/render_heatmap_layer.cpp @@ -123,7 +123,7 @@ void RenderHeatmapLayer::render(PaintParameters& parameters, RenderSource*) { parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), stencilMode, gfx::ColorMode::additive(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), *bucket.indexBuffer, bucket.segments, allUniformValues, @@ -171,7 +171,7 @@ void RenderHeatmapLayer::render(PaintParameters& parameters, RenderSource*) { gfx::DepthMode::disabled(), gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), parameters.staticData.quadTriangleIndexBuffer, parameters.staticData.extrusionTextureSegments, allUniformValues, diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp index f492464b4d..c18e09512d 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp @@ -100,7 +100,7 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), indexBuffer, segments, allUniformValues, @@ -161,7 +161,7 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), parameters.staticData.quadTriangleIndexBuffer, parameters.staticData.rasterSegments, allUniformValues, diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp index 8b303890eb..5b36cd4158 100644 --- a/src/mbgl/renderer/layers/render_line_layer.cpp +++ b/src/mbgl/renderer/layers/render_line_layer.cpp @@ -91,7 +91,7 @@ void RenderLineLayer::render(PaintParameters& parameters, RenderSource*) { parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), parameters.stencilModeForClipping(tile.clip), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), *bucket.indexBuffer, bucket.segments, allUniformValues, diff --git a/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp index 86dd0ca61b..1912c84fc7 100644 --- a/src/mbgl/renderer/layers/render_raster_layer.cpp +++ b/src/mbgl/renderer/layers/render_raster_layer.cpp @@ -114,7 +114,7 @@ void RenderRasterLayer::render(PaintParameters& parameters, RenderSource* source parameters.depthModeForSublayer(0, gfx::DepthMaskType::ReadOnly), gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), indexBuffer, segments, allUniformValues, diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index f87482fed4..44d0c0001e 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -122,7 +122,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { : gfx::DepthMode::disabled(), gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), *buffers.indexBuffer, buffers.segments, allUniformValues, @@ -255,7 +255,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { gfx::DepthMode::disabled(), gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), CollisionBoxProgram::UniformValues { uniforms::u_matrix::Value( tile.matrix ), uniforms::u_extrude_scale::Value( extrudeScale ), @@ -290,7 +290,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { gfx::DepthMode::disabled(), gfx::StencilMode::disabled(), parameters.colorModeForRenderPass(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), CollisionCircleProgram::UniformValues { uniforms::u_matrix::Value( tile.matrix ), uniforms::u_extrude_scale::Value( extrudeScale ), diff --git a/src/mbgl/renderer/render_tile.cpp b/src/mbgl/renderer/render_tile.cpp index 358965847f..1ea39f6bd7 100644 --- a/src/mbgl/renderer/render_tile.cpp +++ b/src/mbgl/renderer/render_tile.cpp @@ -99,7 +99,7 @@ void RenderTile::finishRender(PaintParameters& parameters) { gfx::DepthMode::disabled(), parameters.stencilModeForClipping(clip), gfx::ColorMode::unblended(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), *tile.debugBucket->indexBuffer, tile.debugBucket->segments, program.computeAllUniformValues( @@ -121,7 +121,7 @@ void RenderTile::finishRender(PaintParameters& parameters) { gfx::DepthMode::disabled(), parameters.stencilModeForClipping(clip), gfx::ColorMode::unblended(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), *tile.debugBucket->indexBuffer, tile.debugBucket->segments, program.computeAllUniformValues( @@ -145,7 +145,7 @@ void RenderTile::finishRender(PaintParameters& parameters) { gfx::DepthMode::disabled(), parameters.stencilModeForClipping(clip), gfx::ColorMode::unblended(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), parameters.staticData.tileBorderIndexBuffer, parameters.staticData.tileBorderSegments, program.computeAllUniformValues( diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index 9575efbb81..aee7a243d4 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -453,7 +453,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { gfx::StencilOpType::Replace }, gfx::ColorMode::disabled(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), parameters.staticData.quadTriangleIndexBuffer, parameters.staticData.tileTriangleSegments, program.computeAllUniformValues( diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp index 1d1a656363..410491d255 100644 --- a/src/mbgl/renderer/sources/render_image_source.cpp +++ b/src/mbgl/renderer/sources/render_image_source.cpp @@ -67,7 +67,7 @@ void RenderImageSource::finishRender(PaintParameters& parameters) { gfx::DepthMode::disabled(), gfx::StencilMode::disabled(), gfx::ColorMode::unblended(), - gl::CullFaceMode::disabled(), + gfx::CullFaceMode::disabled(), parameters.staticData.tileBorderIndexBuffer, parameters.staticData.tileBorderSegments, programInstance.computeAllUniformValues( |