izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge from Release-Engine-Staging @ 16579919

Browse Source 
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16581170 by aurel cordonnier in ue5-release-engine-test branch]
This commit is contained in:
aurel cordonnier
2021-06-07 20:09:45 -04:00
parent 0450ad77d7
commit 25a11deeac
1670 changed files with 288579 additions and 21830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/Launch/Private/LaunchEngineLoop.cpp
+15 -7
View File
@@ -4814,7 +4814,7 @@ static inline void BeginFrameRenderThread(FRHICommandListImmediate& RHICmdList,
RHICmdList.EnqueueLambda([CurrentFrameCounter](FRHICommandListImmediate& InRHICmdList)
{
GEngine->SetRenderLatencyMarkerStart(CurrentFrameCounter);
GEngine->SetRenderSubmitLatencyMarkerStart(CurrentFrameCounter);
});
}
@@ -4823,7 +4823,7 @@ static inline void EndFrameRenderThread(FRHICommandListImmediate& RHICmdList, ui
{
RHICmdList.EnqueueLambda([CurrentFrameCounter](FRHICommandListImmediate& InRHICmdList)
{
GEngine->SetRenderLatencyMarkerEnd(CurrentFrameCounter);
GEngine->SetRenderSubmitLatencyMarkerEnd(CurrentFrameCounter);
});
FCoreDelegates::OnEndFrameRT.Broadcast();
@@ -4953,7 +4953,7 @@ void FEngineLoop::Tick()
{
QUICK_SCOPE_CYCLE_COUNTER(STAT_FEngineLoop_UpdateTimeAndHandleMaxTickRate);
GEngine->UpdateTimeAndHandleMaxTickRate();
GEngine->SetGameLatencyMarkerStart(CurrentFrameCounter);
GEngine->SetSimulationLatencyMarkerStart(CurrentFrameCounter);
}
for (const FWorldContext& Context : GEngine->GetWorldContexts())
@@ -5039,6 +5039,8 @@ void FEngineLoop::Tick()
// will pass us messages instead.
if (!GUELibraryOverrideSettings.bIsEmbedded)
{
GEngine->SetInputSampleLatencyMarker(CurrentFrameCounter);
//QUICK_SCOPE_CYCLE_COUNTER(STAT_PumpMessages);
FPlatformApplicationMisc::PumpMessages(true);
}
@@ -5285,9 +5287,19 @@ void FEngineLoop::Tick()
RHITick( FApp::GetDeltaTime() ); // Update RHI.
}
// We need to set this marker before EndFrameRenderThread is enqueued.
// If multithreaded rendering is off, it can cause a bad ordering of game and rendering markers.
GEngine->SetSimulationLatencyMarkerEnd(CurrentFrameCounter);
// Increment global frame counter. Once for each engine tick.
GFrameCounter++;
ENQUEUE_RENDER_COMMAND(FrameCounter)(
[CurrentFrameCounter = GFrameCounter](FRHICommandListImmediate& RHICmdList)
{
GFrameCounterRenderThread = CurrentFrameCounter;
});
// Disregard first few ticks for total tick time as it includes loading and such.
if (GFrameCounter > 6)
{
@@ -5343,10 +5355,6 @@ void FEngineLoop::Tick()
}
#endif
// We need to set this marker before EndFrameRenderThread is enqueued.
// If multithreaded rendering is off, it can cause a bad ordering of game and rendering markers.
GEngine->SetGameLatencyMarkerEnd(CurrentFrameCounter);
// end of RHI frame
ENQUEUE_RENDER_COMMAND(EndFrame)(
[CurrentFrameCounter](FRHICommandListImmediate& RHICmdList)