From c5ec9cafa74d2312b4849ca0c16edc1db7079b6b Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 18 Jul 2017 09:55:22 -0700 Subject: [core] Inline Painter::renderBackground --- cmake/core-files.cmake | 1 - .../renderer/layers/render_background_layer.cpp | 75 ++++++++++++++++++- src/mbgl/renderer/painter.hpp | 2 - src/mbgl/renderer/painters/painter_background.cpp | 85 ---------------------- 4 files changed, 74 insertions(+), 89 deletions(-) delete mode 100644 src/mbgl/renderer/painters/painter_background.cpp diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 4822c395a1..f00f30cdb4 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -245,7 +245,6 @@ set(MBGL_CORE_FILES src/mbgl/renderer/layers/render_symbol_layer.hpp # renderer/painters - src/mbgl/renderer/painters/painter_background.cpp src/mbgl/renderer/painters/painter_circle.cpp src/mbgl/renderer/painters/painter_clipping.cpp src/mbgl/renderer/painters/painter_debug.cpp diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp index f17d8d9eed..cbf8d2f074 100644 --- a/src/mbgl/renderer/layers/render_background_layer.cpp +++ b/src/mbgl/renderer/layers/render_background_layer.cpp @@ -2,9 +2,16 @@ #include #include #include +#include +#include +#include +#include +#include namespace mbgl { +using namespace style; + RenderBackgroundLayer::RenderBackgroundLayer(Immutable _impl) : RenderLayer(style::LayerType::Background, _impl), unevaluated(impl().paint.untransitioned()) { @@ -36,7 +43,73 @@ bool RenderBackgroundLayer::hasTransition() const { } void RenderBackgroundLayer::render(Painter& painter, PaintParameters& parameters, RenderSource*) { - painter.renderBackground(parameters, *this); + // Note that for bottommost layers without a pattern, the background color is drawn with + // glClear rather than this method. + + style::FillPaintProperties::PossiblyEvaluated properties; + properties.get() = evaluated.get(); + properties.get() = { evaluated.get() }; + properties.get() = { evaluated.get() }; + + const FillProgram::PaintPropertyBinders paintAttibuteData(properties, 0); + + if (!evaluated.get().to.empty()) { + optional imagePosA = painter.imageManager->getPattern(evaluated.get().from); + optional imagePosB = painter.imageManager->getPattern(evaluated.get().to); + + if (!imagePosA || !imagePosB) + return; + + painter.imageManager->bind(painter.context, 0); + + for (const auto& tileID : util::tileCover(painter.state, painter.state.getIntegerZoom())) { + parameters.programs.fillPattern.get(properties).draw( + painter.context, + gl::Triangles(), + painter.depthModeForSublayer(0, gl::DepthMode::ReadOnly), + gl::StencilMode::disabled(), + painter.colorModeForRenderPass(), + FillPatternUniforms::values( + painter.matrixForTile(tileID), + painter.context.viewport.getCurrentValue().size, + painter.imageManager->getPixelSize(), + *imagePosA, + *imagePosB, + evaluated.get(), + tileID, + painter.state + ), + painter.tileVertexBuffer, + painter.quadTriangleIndexBuffer, + painter.tileTriangleSegments, + paintAttibuteData, + properties, + painter.state.getZoom(), + getID() + ); + } + } else { + for (const auto& tileID : util::tileCover(painter.state, painter.state.getIntegerZoom())) { + parameters.programs.fill.get(properties).draw( + painter.context, + gl::Triangles(), + painter.depthModeForSublayer(0, gl::DepthMode::ReadOnly), + gl::StencilMode::disabled(), + painter.colorModeForRenderPass(), + FillProgram::UniformValues { + uniforms::u_matrix::Value{ painter.matrixForTile(tileID) }, + uniforms::u_world::Value{ painter.context.viewport.getCurrentValue().size }, + }, + painter.tileVertexBuffer, + painter.quadTriangleIndexBuffer, + painter.tileTriangleSegments, + paintAttibuteData, + properties, + painter.state.getZoom(), + getID() + ); + } + } } } // namespace mbgl diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index 08ca76bf16..ca90f6a1f0 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -52,7 +52,6 @@ class RenderLineLayer; class RenderCircleLayer; class RenderSymbolLayer; class RenderRasterLayer; -class RenderBackgroundLayer; class Programs; class PaintParameters; @@ -88,7 +87,6 @@ public: void renderCircle(PaintParameters&, CircleBucket&, const RenderCircleLayer&, const RenderTile&); void renderSymbol(PaintParameters&, SymbolBucket&, const RenderSymbolLayer&, const RenderTile&); void renderRaster(PaintParameters&, RasterBucket&, const RenderRasterLayer&, const mat4&, bool useBucketBuffers /* = false */); - void renderBackground(PaintParameters&, const RenderBackgroundLayer&); void renderItem(PaintParameters&, const RenderItem&); diff --git a/src/mbgl/renderer/painters/painter_background.cpp b/src/mbgl/renderer/painters/painter_background.cpp deleted file mode 100644 index 661da0cc99..0000000000 --- a/src/mbgl/renderer/painters/painter_background.cpp +++ /dev/null @@ -1,85 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include - -namespace mbgl { - -using namespace style; - -void Painter::renderBackground(PaintParameters& parameters, const RenderBackgroundLayer& layer) { - // Note that for bottommost layers without a pattern, the background color is drawn with - // glClear rather than this method. - const BackgroundPaintProperties::PossiblyEvaluated& background = layer.evaluated; - - style::FillPaintProperties::PossiblyEvaluated properties; - properties.get() = background.get(); - properties.get() = { background.get() }; - properties.get() = { background.get() }; - - const FillProgram::PaintPropertyBinders paintAttibuteData(properties, 0); - - if (!background.get().to.empty()) { - optional imagePosA = imageManager->getPattern(background.get().from); - optional imagePosB = imageManager->getPattern(background.get().to); - - if (!imagePosA || !imagePosB) - return; - - imageManager->bind(context, 0); - - for (const auto& tileID : util::tileCover(state, state.getIntegerZoom())) { - parameters.programs.fillPattern.get(properties).draw( - context, - gl::Triangles(), - depthModeForSublayer(0, gl::DepthMode::ReadOnly), - gl::StencilMode::disabled(), - colorModeForRenderPass(), - FillPatternUniforms::values( - matrixForTile(tileID), - context.viewport.getCurrentValue().size, - imageManager->getPixelSize(), - *imagePosA, - *imagePosB, - background.get(), - tileID, - state - ), - tileVertexBuffer, - quadTriangleIndexBuffer, - tileTriangleSegments, - paintAttibuteData, - properties, - state.getZoom(), - layer.getID() - ); - } - } else { - for (const auto& tileID : util::tileCover(state, state.getIntegerZoom())) { - parameters.programs.fill.get(properties).draw( - context, - gl::Triangles(), - depthModeForSublayer(0, gl::DepthMode::ReadOnly), - gl::StencilMode::disabled(), - colorModeForRenderPass(), - FillProgram::UniformValues { - uniforms::u_matrix::Value{ matrixForTile(tileID) }, - uniforms::u_world::Value{ context.viewport.getCurrentValue().size }, - }, - tileVertexBuffer, - quadTriangleIndexBuffer, - tileTriangleSegments, - paintAttibuteData, - properties, - state.getZoom(), - layer.getID() - ); - } - } -} - -} // namespace mbgl -- cgit v1.2.1