Merge remote-tracking branch 'origin/master' into 1.9

2024-08-05 20:00:39 +02:00
parent e44e44d317 0b03a5da0d
commit bc313c8630
52 changed files with 983 additions and 131 deletions
--- a/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp
+++ b/Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp
@@ -670,6 +670,17 @@ void GlobalSurfaceAtlasPass::Dispose()
    _shader = nullptr;
 }

+bool GlobalSurfaceAtlasPass::Get(const RenderBuffers* buffers, BindingData& result)
+{
+    auto* surfaceAtlasData = buffers ? buffers->FindCustomBuffer<GlobalSurfaceAtlasCustomBuffer>(TEXT("GlobalSurfaceAtlas")) : nullptr;
+    if (surfaceAtlasData && surfaceAtlasData->LastFrameUsed + 1 >= Engine::FrameCount) // Allow to use Surface Atlas from the previous frame (not used currently)
+    {
+        result = surfaceAtlasData->Result;
+        return false;
+    }
+    return true;
+}
+
 void GlobalSurfaceAtlasPass::OnCollectDrawCalls(RenderContextBatch& renderContextBatch)
 {
    // Check if Global Surface Atlas will be used this frame