[core] Remove RenderPass::Upload
This commit is contained in:
@@ -41,7 +41,7 @@ void RenderHeatmapLayer::evaluate(const PropertyEvaluationParameters& parameters
|
||||
unevaluated.evaluate(parameters));
|
||||
|
||||
passes = (properties->evaluated.get<style::HeatmapOpacity>() > 0)
|
||||
? (RenderPass::Translucent | RenderPass::Pass3D | RenderPass::Upload)
|
||||
? (RenderPass::Translucent | RenderPass::Pass3D)
|
||||
: RenderPass::None;
|
||||
|
||||
evaluatedProperties = std::move(properties);
|
||||
|
||||
@@ -47,7 +47,7 @@ void RenderLineLayer::evaluate(const PropertyEvaluationParameters& parameters) {
|
||||
passes = (evaluated.get<style::LineOpacity>().constantOr(1.0) > 0
|
||||
&& evaluated.get<style::LineColor>().constantOr(Color::black()).a > 0
|
||||
&& evaluated.get<style::LineWidth>().constantOr(1.0) > 0)
|
||||
? RenderPass::Translucent | RenderPass::Upload : RenderPass::None;
|
||||
? RenderPass::Translucent : RenderPass::None;
|
||||
evaluatedProperties = std::move(properties);
|
||||
}
|
||||
|
||||
|
||||
@@ -262,7 +262,7 @@ void RenderSymbolLayer::evaluate(const PropertyEvaluationParameters& parameters)
|
||||
|
||||
passes = ((evaluated.get<style::IconOpacity>().constantOr(1) > 0 && hasIconOpacity && iconSize > 0)
|
||||
|| (evaluated.get<style::TextOpacity>().constantOr(1) > 0 && hasTextOpacity && textSize > 0))
|
||||
? RenderPass::Translucent | RenderPass::Upload : RenderPass::None;
|
||||
? RenderPass::Translucent : RenderPass::None;
|
||||
|
||||
evaluatedProperties = std::move(properties);
|
||||
}
|
||||
|
||||
@@ -12,7 +12,6 @@ enum class RenderPass : uint8_t {
|
||||
Opaque = 1 << 0,
|
||||
Translucent = 1 << 1,
|
||||
Pass3D = 1 << 2,
|
||||
Upload = 1 << 3,
|
||||
};
|
||||
|
||||
MBGL_CONSTEXPR RenderPass operator|(RenderPass a, RenderPass b) {
|
||||
|
||||
@@ -387,10 +387,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
|
||||
}
|
||||
|
||||
for (auto& renderItem : renderItems) {
|
||||
RenderLayer& renderLayer = renderItem.layer;
|
||||
if (renderLayer.hasRenderPass(RenderPass::Upload)) {
|
||||
renderLayer.upload(*uploadPass);
|
||||
}
|
||||
renderItem.layer.get().upload(*uploadPass);
|
||||
}
|
||||
|
||||
staticData->upload(*uploadPass);
|
||||
|
||||
Reference in New Issue
Block a user