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 @ 17636544 to Release-Engine-Test

Browse Source 
This represents UE4/Main @17638339 and Dev-PerfTest @17636504

[CL 17638842 by aurel cordonnier in ue5-release-engine-test branch]
This commit is contained in:
aurel cordonnier
2021-09-27 19:54:25 -04:00
parent 6c4c21ba90
commit 69fe095547
763 changed files with 27408 additions and 9010 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/Core/Private/ProfilingDebugging/CsvProfiler.cpp
+5 -2
View File
@@ -2035,8 +2035,7 @@ private:
{
Series = StatSeriesArray[StatIndex];
#if DO_CHECK
FString StatName = StatRegister.GetStatName(StatIndex);
checkf(SeriesType == Series->SeriesType, TEXT("Stat named %s was used in multiple stat types. Can't use same identifier for different stat types. Stat types are: Custom(Int), Custom(Float) and Timing"), *StatName);
checkf(SeriesType == Series->SeriesType, TEXT("Stat named %s was used in multiple stat types. Can't use same identifier for different stat types. Stat types are: Custom(Int), Custom(Float) and Timing"), *StatRegister.GetStatName(StatIndex));
#endif
}
return Series;
@@ -2301,6 +2300,8 @@ public:
GCsvProcessingThreadId = FPlatformTLS::GetCurrentThreadId();
GGameThreadIsCsvProcessingThread = false;
FMemory::SetupTLSCachesOnCurrentThread();
LLM_SCOPE(ELLMTag::CsvProfiler);
while (StopCounter.GetValue() == 0)
@@ -2317,6 +2318,8 @@ public:
FPlatformProcess::Sleep(SleepTimeSeconds);
}
FMemory::ClearAndDisableTLSCachesOnCurrentThread();
return 0;
}