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

[ShaderCompileWorker] minor fixes:

Browse Source 
- allow 0 TimeToLive to be specified explicitly on commandline (useful when debugging single-job debug worker input files, without this it keeps running the same job repeatedly) and modify single job worker input commandline txt file to use this instead of 0.5f
- change config-conditional behaviour serializing to memory instead of file on disk to be conditional on an optional cmdline argument instead, and move file copy into the block that does the file writing (otherwise it repeatedly tries and fails to copy the nonexistent file)

#preflight 6377fed033774509008c42c6
#rb Jason.Nadro

[CL 23234934 by dan elksnitis in ue5-main branch]
This commit is contained in:
dan elksnitis
2022-11-22 09:42:02 -05:00
parent 090593c42c
commit 92c56f938f
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Engine/Source/Programs/ShaderCompileWorker/Private/ShaderCompileWorker.cpp
View File

@@ -301,6 +301,7 @@ class FWorkLoop
public:
// If we have been idle for 20 seconds then exit. Can be overriden from the cmd line with -TimeToLive=N where N is in seconds (and a float value)
float TimeToLive = 20.0f;
bool DisableFileWrite = false;
FWorkLoop(const TCHAR* ParentProcessIdText,const TCHAR* InWorkingDirectory,const TCHAR* InInputFilename,const TCHAR* InOutputFilename, TMap<FString, uint32>& InFormatVersionMap)
: ParentProcessId(FCString::Atoi(ParentProcessIdText))
@@ -317,12 +318,11 @@ public:
{
if (Switch.StartsWith(TEXT("TimeToLive=")))
{
float TokenTime = FCString::Atof(Switch.GetCharArray().GetData() + 11);
if (TokenTime > 0)
{
TimeToLive = TokenTime;
break;
}
TimeToLive = FCString::Atof(Switch.GetCharArray().GetData() + 11);
}
else if (Switch.Equals(TEXT("DisableFileWrite")))
{
DisableFileWrite = true;
}
}
}
@@ -358,23 +358,24 @@ public:
}
// Prepare for output
#if UE_BUILD_DEBUG
TArray<uint8> MemBlock;
FMemoryWriter MemWriter(MemBlock);
FArchive* OutputFilePtr = &MemWriter;
#else
FArchive* OutputFilePtr = CreateOutputArchive();
check(OutputFilePtr);
#endif
WriteToOutputArchive(OutputFilePtr, SingleJobResults, PipelineJobResults);
if (DisableFileWrite)
{
// write to in-memory bytestream instead for debugging purposes
TArray<uint8> MemBlock;
FMemoryWriter MemWriter(MemBlock);
WriteToOutputArchive(&MemWriter, SingleJobResults, PipelineJobResults);
}
else
{
FArchive* OutputFilePtr = CreateOutputArchive();
check(OutputFilePtr);
WriteToOutputArchive(OutputFilePtr, SingleJobResults, PipelineJobResults);
// Close the output file.
delete OutputFilePtr;
#if !UE_BUILD_DEBUG
// Close the output file.
delete OutputFilePtr;
#endif
// Change the output file name to requested one
IFileManager::Get().Move(*OutputFilePath, *TempFilePath);
// Change the output file name to requested one
IFileManager::Get().Move(*OutputFilePath, *TempFilePath);
}
if (IsUsingXGE())
{