Metal setup merge (#1616)
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Alex Cristici <alex.cristici@gmail.com> Co-authored-by: mwilsnd <mwilsnd@gmail.com> Co-authored-by: Stefan Karschti <stefan.karschti@gmail.com> Co-authored-by: Bart Louwers <bart@emeel.net> Co-authored-by: Alex Cristici <alex@skoon.energy> Co-authored-by: Bart Louwers <bart.louwers@gmail.com> Co-authored-by: Wei Chen <alanchenboy@gmail.com> Co-authored-by: Siarhei Fedartsou <siarhei.fedartsou@gmail.com> Co-authored-by: tdcosta100 <tdcosta100@gmail.com>
This commit is contained in:
@@ -19,13 +19,18 @@
|
||||
|
||||
#if MLN_DRAWABLE_RENDERER
|
||||
#include <mbgl/gfx/drawable_tweaker.hpp>
|
||||
#include <mbgl/gl/drawable_gl.hpp>
|
||||
#include <mbgl/renderer/layer_tweaker.hpp>
|
||||
#include <mbgl/renderer/render_target.hpp>
|
||||
#include <mbgl/shaders/gl/shader_program_gl.hpp>
|
||||
|
||||
#include <limits>
|
||||
#endif
|
||||
#endif // MLN_DRAWABLE_RENDERER
|
||||
|
||||
#if !MLN_RENDER_BACKEND_METAL
|
||||
#include <mbgl/gl/defines.hpp>
|
||||
#if MLN_DRAWABLE_RENDERER
|
||||
#include <mbgl/gl/drawable_gl.hpp>
|
||||
#endif // MLN_DRAWABLE_RENDERER
|
||||
#endif // !MLN_RENDER_BACKEND_METAL
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
@@ -99,7 +104,8 @@ void Renderer::Impl::render(const RenderTree& renderTree,
|
||||
renderTreeParameters.transformParams,
|
||||
*staticData,
|
||||
renderTree.getLineAtlas(),
|
||||
renderTree.getPatternAtlas()};
|
||||
renderTree.getPatternAtlas(),
|
||||
frameCount};
|
||||
|
||||
parameters.symbolFadeChange = renderTreeParameters.symbolFadeChange;
|
||||
parameters.opaquePassCutoff = renderTreeParameters.opaquePassCutOff;
|
||||
@@ -109,7 +115,11 @@ void Renderer::Impl::render(const RenderTree& renderTree,
|
||||
// - UPLOAD PASS -------------------------------------------------------------------------------
|
||||
// Uploads all required buffers and images before we do any actual rendering.
|
||||
{
|
||||
const auto uploadPass = parameters.encoder->createUploadPass("upload");
|
||||
const auto uploadPass = parameters.encoder->createUploadPass("upload",
|
||||
parameters.backend.getDefaultRenderable());
|
||||
#if !defined(NDEBUG)
|
||||
const auto debugGroup = uploadPass->createDebugGroup("upload");
|
||||
#endif
|
||||
|
||||
// Update all clipping IDs + upload buckets.
|
||||
for (const RenderItem& item : sourceRenderItems) {
|
||||
@@ -131,15 +141,23 @@ void Renderer::Impl::render(const RenderTree& renderTree,
|
||||
*staticData->shaders, context, renderTreeParameters.transformParams.state, updateParameters, renderTree);
|
||||
}
|
||||
|
||||
// Process changes
|
||||
orchestrator.processChanges();
|
||||
|
||||
// Run layer tweakers to update any dynamic elements
|
||||
orchestrator.visitLayerGroups([&](LayerGroupBase& layerGroup) {
|
||||
if (layerGroup.getLayerTweaker()) {
|
||||
layerGroup.getLayerTweaker()->execute(layerGroup, renderTree, parameters);
|
||||
}
|
||||
});
|
||||
// Upload layer groups
|
||||
{
|
||||
const auto uploadPass = parameters.encoder->createUploadPass("layerGroup-upload",
|
||||
parameters.backend.getDefaultRenderable());
|
||||
#if !defined(NDEBUG)
|
||||
const auto debugGroup = uploadPass->createDebugGroup("layerGroup-upload");
|
||||
#endif
|
||||
|
||||
// Tweakers are run in the upload pass so they can set up uniforms.
|
||||
orchestrator.visitLayerGroups([&](LayerGroupBase& layerGroup) {
|
||||
if (layerGroup.getLayerTweaker()) {
|
||||
layerGroup.getLayerTweaker()->execute(layerGroup, renderTree, parameters);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Update the debug layer groups
|
||||
orchestrator.updateDebugLayerGroups(renderTree, parameters);
|
||||
@@ -150,7 +168,8 @@ void Renderer::Impl::render(const RenderTree& renderTree,
|
||||
|
||||
// Upload layer groups
|
||||
{
|
||||
const auto uploadPass = parameters.encoder->createUploadPass("layerGroup-upload");
|
||||
const auto uploadPass = parameters.encoder->createUploadPass("layerGroup-upload",
|
||||
parameters.backend.getDefaultRenderable());
|
||||
|
||||
// Give the layers a chance to upload
|
||||
orchestrator.visitLayerGroups([&](LayerGroupBase& layerGroup) { layerGroup.upload(*uploadPass); });
|
||||
@@ -367,7 +386,7 @@ void Renderer::Impl::render(const RenderTree& renderTree,
|
||||
renderDebugOverlays();
|
||||
#else
|
||||
static_assert(0, "Must define one of (MLN_DRAWABLE_RENDERER, MLN_LEGACY_RENDERER)");
|
||||
#endif
|
||||
#endif // MLN_LEGACY_RENDERER
|
||||
|
||||
#if MLN_DRAWABLE_RENDERER
|
||||
// Give the layers a chance to do cleanup
|
||||
@@ -395,6 +414,8 @@ void Renderer::Impl::render(const RenderTree& renderTree,
|
||||
renderState = RenderState::Fully;
|
||||
observer->onDidFinishRenderingMap();
|
||||
}
|
||||
|
||||
frameCount += 1;
|
||||
}
|
||||
|
||||
void Renderer::Impl::reduceMemoryUse() {
|
||||
|
||||
Reference in New Issue
Block a user