tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Remove ImageManager from upload parameters

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-05-27 11:52:54 +03:00
parent 892699a39a
commit c0e5632001
7 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mbgl/renderer/layers/render_background_layer.cpp
View File

@@ -38,9 +38,6 @@ void RenderBackgroundLayer::evaluate(const PropertyEvaluationParameters &paramet
passes = properties->evaluated.get<style::BackgroundOpacity>() > 0 ? RenderPass::Translucent
: RenderPass::None;
if (passes != RenderPass::None && !properties->evaluated.get<style::BackgroundPattern>().to.empty()) {
passes |= RenderPass::Upload;
}
evaluatedProperties = std::move(properties);
}
@@ -52,15 +49,6 @@ bool RenderBackgroundLayer::hasCrossfade() const {
return getCrossfade<BackgroundLayerProperties>(evaluatedProperties).t != 1;
}
void RenderBackgroundLayer::upload(gfx::UploadPass&, UploadParameters& parameters) {
const auto& evaluated = static_cast<const BackgroundLayerProperties&>(*evaluatedProperties).evaluated;
if (!evaluated.get<BackgroundPattern>().to.empty()) {
// Ensures that the texture gets added and uploaded to the atlas.
parameters.imageManager.getPattern(evaluated.get<BackgroundPattern>().from);
parameters.imageManager.getPattern(evaluated.get<BackgroundPattern>().to);
}
}
void RenderBackgroundLayer::render(PaintParameters& parameters) {
// Note that for bottommost layers without a pattern, the background color is drawn with
// glClear rather than this method.
@@ -152,4 +140,13 @@ optional<Color> RenderBackgroundLayer::getSolidBackground() const {
return { evaluated.get<BackgroundColor>() * evaluated.get<BackgroundOpacity>() };
}
void RenderBackgroundLayer::prepare(const LayerPrepareParameters& params) {
const auto& evaluated = static_cast<const BackgroundLayerProperties&>(*evaluatedProperties).evaluated;
if (!evaluated.get<BackgroundPattern>().to.empty()) {
// Ensures that the texture gets added and uploaded to the atlas.
params.imageManager.getPattern(evaluated.get<BackgroundPattern>().from);
params.imageManager.getPattern(evaluated.get<BackgroundPattern>().to);
}
}
} // namespace mbgl