diff options
Diffstat (limited to 'src/mbgl/renderer/layers')
20 files changed, 58 insertions, 43 deletions
diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp index 51c4f2ae4f..37386c2532 100644 --- a/src/mbgl/renderer/layers/render_background_layer.cpp +++ b/src/mbgl/renderer/layers/render_background_layer.cpp @@ -61,7 +61,7 @@ void RenderBackgroundLayer::upload(gfx::UploadPass&, UploadParameters& parameter } } -void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) { +void RenderBackgroundLayer::render(PaintParameters& parameters) { // Note that for bottommost layers without a pattern, the background color is drawn with // glClear rather than this method. diff --git a/src/mbgl/renderer/layers/render_background_layer.hpp b/src/mbgl/renderer/layers/render_background_layer.hpp index 248a3e1457..7dcbdc0b80 100644 --- a/src/mbgl/renderer/layers/render_background_layer.hpp +++ b/src/mbgl/renderer/layers/render_background_layer.hpp @@ -18,7 +18,7 @@ private: bool hasCrossfade() const override; optional<Color> getSolidBackground() const override; void upload(gfx::UploadPass&, UploadParameters&) override; - void render(PaintParameters&, RenderSource*) override; + void render(PaintParameters&) override; // Paint properties style::BackgroundPaintProperties::Unevaluated unevaluated; diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index 7c922c51ad..b5bbc4b22e 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -52,7 +52,7 @@ bool RenderCircleLayer::hasCrossfade() const { return false; } -void RenderCircleLayer::render(PaintParameters& parameters, RenderSource*) { +void RenderCircleLayer::render(PaintParameters& parameters) { if (parameters.pass == RenderPass::Opaque) { return; } diff --git a/src/mbgl/renderer/layers/render_circle_layer.hpp b/src/mbgl/renderer/layers/render_circle_layer.hpp index fbe67c91ac..9348e48929 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.hpp +++ b/src/mbgl/renderer/layers/render_circle_layer.hpp @@ -16,7 +16,7 @@ private: void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override; bool hasCrossfade() const override; - void render(PaintParameters&, RenderSource*) override; + void render(PaintParameters&) override; bool queryIntersectsFeature( const GeometryCoordinates&, diff --git a/src/mbgl/renderer/layers/render_custom_layer.cpp b/src/mbgl/renderer/layers/render_custom_layer.cpp index 4148de1ddd..1371326963 100644 --- a/src/mbgl/renderer/layers/render_custom_layer.cpp +++ b/src/mbgl/renderer/layers/render_custom_layer.cpp @@ -50,7 +50,7 @@ void RenderCustomLayer::markContextDestroyed() { contextDestroyed = true; } -void RenderCustomLayer::render(PaintParameters& paintParameters, RenderSource*) { +void RenderCustomLayer::render(PaintParameters& paintParameters) { if (host != impl(baseImpl).host) { //If the context changed, deinitialize the previous one before initializing the new one. if (host && !contextDestroyed) { diff --git a/src/mbgl/renderer/layers/render_custom_layer.hpp b/src/mbgl/renderer/layers/render_custom_layer.hpp index 0c364cfc0c..32450e643f 100644 --- a/src/mbgl/renderer/layers/render_custom_layer.hpp +++ b/src/mbgl/renderer/layers/render_custom_layer.hpp @@ -17,7 +17,7 @@ private: bool hasCrossfade() const override; void markContextDestroyed() override; - void render(PaintParameters&, RenderSource*) override; + void render(PaintParameters&) override; bool contextDestroyed = false; std::shared_ptr<style::CustomLayerHost> host; diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp index 6c2d049948..a21f62c6a6 100644 --- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp @@ -55,7 +55,7 @@ bool RenderFillExtrusionLayer::hasCrossfade() const { return getCrossfade<FillExtrusionLayerProperties>(evaluatedProperties).t != 1; } -void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource*) { +void RenderFillExtrusionLayer::render(PaintParameters& parameters) { if (parameters.pass != RenderPass::Translucent) { return; } diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp index fa50ac6f2c..9118601581 100644 --- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp +++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.hpp @@ -17,7 +17,7 @@ private: void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override; bool hasCrossfade() const override; - void render(PaintParameters&, RenderSource*) override; + void render(PaintParameters&) override; bool queryIntersectsFeature( const GeometryCoordinates&, diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp index ec446136dc..cea40602d0 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_layer.cpp @@ -72,7 +72,7 @@ bool RenderFillLayer::hasCrossfade() const { return getCrossfade<FillLayerProperties>(evaluatedProperties).t != 1; } -void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) { +void RenderFillLayer::render(PaintParameters& parameters) { if (unevaluated.get<FillPattern>().isUndefined()) { parameters.renderTileClippingMasks(renderTiles); for (const RenderTile& tile : renderTiles) { diff --git a/src/mbgl/renderer/layers/render_fill_layer.hpp b/src/mbgl/renderer/layers/render_fill_layer.hpp index 5d5206efe2..79adc9dab4 100644 --- a/src/mbgl/renderer/layers/render_fill_layer.hpp +++ b/src/mbgl/renderer/layers/render_fill_layer.hpp @@ -19,7 +19,7 @@ private: void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override; bool hasCrossfade() const override; - void render(PaintParameters&, RenderSource*) override; + void render(PaintParameters&) override; bool queryIntersectsFeature( const GeometryCoordinates&, diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp index 053503bbaa..2c071d1fcf 100644 --- a/src/mbgl/renderer/layers/render_heatmap_layer.cpp +++ b/src/mbgl/renderer/layers/render_heatmap_layer.cpp @@ -62,7 +62,7 @@ void RenderHeatmapLayer::upload(gfx::UploadPass& uploadPass, UploadParameters&) } } -void RenderHeatmapLayer::render(PaintParameters& parameters, RenderSource*) { +void RenderHeatmapLayer::render(PaintParameters& parameters) { if (parameters.pass == RenderPass::Opaque) { return; } diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.hpp b/src/mbgl/renderer/layers/render_heatmap_layer.hpp index f4c0299dd9..f331ef8435 100644 --- a/src/mbgl/renderer/layers/render_heatmap_layer.hpp +++ b/src/mbgl/renderer/layers/render_heatmap_layer.hpp @@ -20,7 +20,7 @@ private: bool hasTransition() const override; bool hasCrossfade() const override; void upload(gfx::UploadPass&, UploadParameters&) override; - void render(PaintParameters&, RenderSource*) override; + void render(PaintParameters&) override; bool queryIntersectsFeature( const GeometryCoordinates&, diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp index a13de7c4cd..b271cd478f 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp @@ -65,14 +65,17 @@ bool RenderHillshadeLayer::hasCrossfade() const { return false; } -void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src) { +void RenderHillshadeLayer::prepare(const LayerPrepareParameters& params) { + RenderLayer::prepare(params); + if (auto* demsrc = params.source->as<RenderRasterDEMSource>()) { + maxzoom = demsrc->getMaxZoom(); + } +} + +void RenderHillshadeLayer::render(PaintParameters& parameters) { if (parameters.pass != RenderPass::Translucent && parameters.pass != RenderPass::Pass3D) return; - const auto& evaluated = static_cast<const HillshadeLayerProperties&>(*evaluatedProperties).evaluated; - auto* demsrc = static_cast<RenderRasterDEMSource*>(src); - const uint8_t TERRAIN_RGB_MAXZOOM = 15; - const uint8_t maxzoom = demsrc != nullptr ? demsrc->getMaxZoom() : TERRAIN_RGB_MAXZOOM; - + const auto& evaluated = static_cast<const HillshadeLayerProperties&>(*evaluatedProperties).evaluated; auto draw = [&] (const mat4& matrix, const auto& vertexBuffer, const auto& indexBuffer, diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.hpp b/src/mbgl/renderer/layers/render_hillshade_layer.hpp index 7c7bc10835..61f5c507a9 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.hpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.hpp @@ -18,10 +18,12 @@ private: bool hasTransition() const override; bool hasCrossfade() const override; - void render(PaintParameters&, RenderSource* src) override; + void render(PaintParameters&) override; + void prepare(const LayerPrepareParameters&) override; // Paint properties style::HillshadePaintProperties::Unevaluated unevaluated; + uint8_t maxzoom = util::TERRAIN_RGB_MAXZOOM; const std::array<float, 2> getLatRange(const UnwrappedTileID& id); const std::array<float, 2> getLight(const PaintParameters& parameters); diff --git a/src/mbgl/renderer/layers/render_line_layer.cpp b/src/mbgl/renderer/layers/render_line_layer.cpp index bfb6ac619e..5b98c75a3e 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::upload(gfx::UploadPass& uploadPass, UploadParameters& uplo } } -void RenderLineLayer::render(PaintParameters& parameters, RenderSource*) { +void RenderLineLayer::render(PaintParameters& parameters) { if (parameters.pass == RenderPass::Opaque) { return; } diff --git a/src/mbgl/renderer/layers/render_line_layer.hpp b/src/mbgl/renderer/layers/render_line_layer.hpp index 0e1e81e557..f57686e1c8 100644 --- a/src/mbgl/renderer/layers/render_line_layer.hpp +++ b/src/mbgl/renderer/layers/render_line_layer.hpp @@ -21,7 +21,7 @@ private: bool hasTransition() const override; bool hasCrossfade() const override; void upload(gfx::UploadPass&, UploadParameters&) override; - void render(PaintParameters&, RenderSource*) override; + void render(PaintParameters&) override; bool queryIntersectsFeature( const GeometryCoordinates&, diff --git a/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp index ce4fb05929..ade5cbb4e1 100644 --- a/src/mbgl/renderer/layers/render_raster_layer.cpp +++ b/src/mbgl/renderer/layers/render_raster_layer.cpp @@ -2,7 +2,6 @@ #include <mbgl/renderer/buckets/raster_bucket.hpp> #include <mbgl/renderer/render_tile.hpp> #include <mbgl/renderer/paint_parameters.hpp> -#include <mbgl/renderer/sources/render_image_source.hpp> #include <mbgl/renderer/render_static_data.hpp> #include <mbgl/programs/programs.hpp> #include <mbgl/programs/raster_program.hpp> @@ -73,7 +72,18 @@ static std::array<float, 3> spinWeights(float spin) { return spin_weights; } -void RenderRasterLayer::render(PaintParameters& parameters, RenderSource* source) { +void RenderRasterLayer::prepare(const LayerPrepareParameters& params) { + RenderLayer::prepare(params); + auto* imageSource = params.source->as<RenderImageSource>(); + if (imageSource && imageSource->isLoaded()) { + assert(imageSource->isEnabled()); + assert(imageSource->sharedData.bucket); + assert(imageSource->sharedData.matrices); + imageData = imageSource->sharedData; + } +} + +void RenderRasterLayer::render(PaintParameters& parameters) { if (parameters.pass != RenderPass::Translucent) return; const auto& evaluated = static_cast<const RasterLayerProperties&>(*evaluatedProperties).evaluated; @@ -132,22 +142,20 @@ void RenderRasterLayer::render(PaintParameters& parameters, RenderSource* source const gfx::TextureFilterType filter = evaluated.get<RasterResampling>() == RasterResamplingType::Nearest ? gfx::TextureFilterType::Nearest : gfx::TextureFilterType::Linear; - if (auto* imageSource = source->as<RenderImageSource>()) { - if (imageSource->isEnabled() && imageSource->isLoaded() && !imageSource->bucket->needsUpload()) { - RasterBucket& bucket = *imageSource->bucket; - assert(bucket.texture); - - for (auto matrix_ : imageSource->matrices) { - draw(matrix_, - *bucket.vertexBuffer, - *bucket.indexBuffer, - bucket.segments, - RasterProgram::TextureBindings{ - textures::image0::Value{ bucket.texture->getResource(), filter }, - textures::image1::Value{ bucket.texture->getResource(), filter }, - }, - bucket.drawScopeID); - } + if (imageData && !imageData->bucket->needsUpload()) { + RasterBucket& bucket = *imageData->bucket; + assert(bucket.texture); + + for (const auto& matrix_ : *imageData->matrices) { + draw(matrix_, + *bucket.vertexBuffer, + *bucket.indexBuffer, + bucket.segments, + RasterProgram::TextureBindings{ + textures::image0::Value{ bucket.texture->getResource(), filter }, + textures::image1::Value{ bucket.texture->getResource(), filter }, + }, + bucket.drawScopeID); } } else { for (const RenderTile& tile : renderTiles) { diff --git a/src/mbgl/renderer/layers/render_raster_layer.hpp b/src/mbgl/renderer/layers/render_raster_layer.hpp index 9d70e9fb4d..9ef7c9837f 100644 --- a/src/mbgl/renderer/layers/render_raster_layer.hpp +++ b/src/mbgl/renderer/layers/render_raster_layer.hpp @@ -1,6 +1,7 @@ #pragma once #include <mbgl/renderer/render_layer.hpp> +#include <mbgl/renderer/sources/render_image_source.hpp> #include <mbgl/style/layers/raster_layer_impl.hpp> #include <mbgl/style/layers/raster_layer_properties.hpp> @@ -16,11 +17,12 @@ private: void evaluate(const PropertyEvaluationParameters&) override; bool hasTransition() const override; bool hasCrossfade() const override; - - void render(PaintParameters&, RenderSource*) override; + void prepare(const LayerPrepareParameters&) override; + void render(PaintParameters&) override; // Paint properties style::RasterPaintProperties::Unevaluated unevaluated; + optional<ImageLayerRenderData> imageData; }; } // namespace mbgl diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 0aae4e469c..7fc0e08b41 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -431,7 +431,7 @@ void RenderSymbolLayer::upload(gfx::UploadPass& uploadPass, UploadParameters& up } } -void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) { +void RenderSymbolLayer::render(PaintParameters& parameters) { if (parameters.pass == RenderPass::Opaque) { return; } diff --git a/src/mbgl/renderer/layers/render_symbol_layer.hpp b/src/mbgl/renderer/layers/render_symbol_layer.hpp index 354f433e60..ffd05aa310 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.hpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.hpp @@ -66,7 +66,7 @@ private: bool hasTransition() const override; bool hasCrossfade() const override; void upload(gfx::UploadPass&, UploadParameters&) override; - void render(PaintParameters&, RenderSource*) override; + void render(PaintParameters&) override; void prepare(const LayerPrepareParameters&) override; // Paint properties |