Commit Graph

18 Commits

Author SHA1 Message Date
Matt Peters
ed6457f264 ITargetPlatform: Delete RefreshSettings. All overrides were removed previously and it is now an empty virtual function and can be removed.
#rb Josh.Adams
#rnx
#preflight 628bd4e1573a7de2c436e39e

[CL 20347492 by Matt Peters in ue5-main branch]
2022-05-24 09:38:04 -04:00
Devin Doucette
292008ea35 Logging: Replaced GLog->PanicFlush() with GLog->Panic()
Panic allows only one thread to become the panic thread. In panic mode, logs are only sent to panic-safe output devices. Each call to Panic flushes buffered logs to panic-safe output devices, and flushes panic-safe output devices.

#jira UE-147152
#preflight 62424814292f228e09d8a612
#rb Zousar.Shaker
#fyi Brandon.Schaefer

[CL 19545093 by Devin Doucette in ue5-main branch]
2022-03-29 13:31:48 -04:00
aurel cordonnier
54f9a674f8 No unity fixes
#jira none
#rb trivial
#preflight 61ad3ae29c77d61007cfb850

#ROBOMERGE-AUTHOR: aurel.cordonnier
#ROBOMERGE-SOURCE: CL 18379553 in //UE5/Release-5.0/... via CL 18379555
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18379556 by aurel cordonnier in ue5-release-engine-test branch]
2021-12-05 17:40:05 -05:00
mark lintott
2b12e2f266 Non-Unity fixes
#rb trivial
#jira none
#preflight 61acb0829b64d95afbe0c58e

#ROBOMERGE-AUTHOR: mark.lintott
#ROBOMERGE-SOURCE: CL 18378195 in //UE5/Release-5.0/... via CL 18378196
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18378197 by mark lintott in ue5-release-engine-test branch]
2021-12-05 07:35:20 -05:00
jason nadro
ee57025d56 [Backout] - CL18273499
[FYI] Jason.Nadro
Original CL Desc
-----------------------------------------------------------------
[ODSC] - Break out recompile shaders functionality into its own file.

- Break out common functionality for both ShaderCompiler.cpp and RecompileShaders.cpp into it's own shared file.

#rb Ben.Ingram
#preflight 619cffb0801b361978aa77d3

#ROBOMERGE-OWNER: jon.nabozny
#ROBOMERGE-AUTHOR: jason.nadro
#ROBOMERGE-SOURCE: CL 18273892 via CL 18277683 via CL 18373309 via CL 18373446
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18373477 by jason nadro in ue5-release-engine-test branch]
2021-12-03 16:22:55 -05:00
jason nadro
44e98944c3 [ODSC] - Break out recompile shaders functionality into its own file.
- Break out common functionality for both ShaderCompiler.cpp and RecompileShaders.cpp into it's own shared file.

#rb Ben.Ingram
#preflight 619cffb0801b361978aa77d3

#ROBOMERGE-OWNER: jon.nabozny
#ROBOMERGE-AUTHOR: jason.nadro
#ROBOMERGE-SOURCE: CL 18273499 via CL 18277654 via CL 18373298 via CL 18373445
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18373470 by jason nadro in ue5-release-engine-test branch]
2021-12-03 16:22:47 -05:00
jon nabozny
138cf19fe8 Implements CookGlobalShaders' -live that recompile/deploy/reload global shader automatically when a shader source file has changed
#rb Krzysztof.Narkowicz
[FYI] stu.mckenna
#lockdown andrew.firth
#preflight 6144aa93c2c1900001458106

#ROBOMERGE-OWNER: jon.nabozny
#ROBOMERGE-AUTHOR: guillaume.abadie
#ROBOMERGE-SOURCE: CL 17552625 via CL 17946034 via CL 18363801 via CL 18363965
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18364061 by jon nabozny in ue5-release-engine-test branch]
2021-12-02 23:09:48 -05:00
jason nadro
27c5094597 [Backout] - CL18273499
[FYI] Jason.Nadro
Original CL Desc
-----------------------------------------------------------------
[ODSC] - Break out recompile shaders functionality into its own file.

- Break out common functionality for both ShaderCompiler.cpp and RecompileShaders.cpp into it's own shared file.

#rb Ben.Ingram
#jira none
#preflight 619cffb0801b361978aa77d3

#ROBOMERGE-AUTHOR: jason.nadro
#ROBOMERGE-SOURCE: CL 18273892 in //UE5/Release-5.0/... via CL 18273919
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18273945 by jason nadro in ue5-release-engine-test branch]
2021-11-23 14:58:58 -05:00
jason nadro
b5c5096269 [ODSC] - Break out recompile shaders functionality into its own file.
- Break out common functionality for both ShaderCompiler.cpp and RecompileShaders.cpp into it's own shared file.

#rb Ben.Ingram
#jira none
#preflight 619cffb0801b361978aa77d3

#ROBOMERGE-AUTHOR: jason.nadro
#ROBOMERGE-SOURCE: CL 18273499 in //UE5/Release-5.0/... via CL 18273518
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18273542 by jason nadro in ue5-release-engine-test branch]
2021-11-23 14:30:48 -05:00
jason nadro
80493a5424 Refactor cooked ODSC to use the same data structures between the ShaderCompiler, CookGlobalShaderCommandlet, and the CookingServer.
## Refactoring
- FShaderRecompileData is the de-factor data structure for holding recompile inputs/outputs (these should be separated).
- FShaderRecompileData has moved from being a CookingServer only data structure to living in ShaderCompiler (Engine runtime).
- UE::Cook::FRecompileShaderRequest was basically a duplicate struct of FShaderRecompileData.  Now it just holds a FShaderRecompileData struct and a callback.
- RecompileShadersForRemote(), which previously accepted a grab bag of arguments, now just takes the FShaderRecompileData struct.
- ShaderPlatform is no longer a int32 but a EShaderPlatform to be more explicit.
- The downside to this approach is all these systems are more tightly coupled, but the sharing of code makes this easier to modify in the future.

## Bug Fixes
- recompileshaders changed would only sometimes work depending on what materials the cooking server had loaded.  Now the command issued by the client will explicitly say which materials to load and compile for.
- In RecompileShadersForRemote remove the call to GetOutdatedShaderTypes because in the cooking server it doesn't work.  That function only works when the shader maps exist, but in the cooking server when loading materials we do not create the maps.  This creates a chicken/egg issue.  Where we need to maps to determine what's out of date and to recompile...but we don't have the maps because we haven't done a compile yet.

## Features
- Display how long the shader request took on the cooking server.
- Print shader stats out at the end of recompile request.

#rb none
#jira UE-121436, UE-113113
#preflight 6196a3f0f020c4e616acff15

#ROBOMERGE-AUTHOR: jason.nadro
#ROBOMERGE-SOURCE: CL 18242119 in //UE5/Release-5.0/... via CL 18242138
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18242996 by jason nadro in ue5-release-engine-test branch]
2021-11-18 15:26:44 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
Guillaume Abadie
fd3984c9d5 Lists platform when CookGlobalShader commandlet has not found a matching platform
#rb none
#fyi stu.mckenna
#preflight 606f038ee1d01600010a4cae

[CL 15954189 by Guillaume Abadie in ue5-main branch]
2021-04-08 10:07:29 -04:00
Guillaume Abadie
fe9fd09d40 Implements SetGlobalShaderCacheOverrideDirectory
#rb luke.thatcher
#preflight 605cccf90944f60001c952eb

[CL 15831586 by Guillaume Abadie in ue5-main branch]
2021-03-25 16:38:44 -04:00
Guillaume Abadie
724bb7042e Adds DeployFolder to CookGlobalShaderCommandlet.cpp
#rb none
#fyi stu.mckenna
#robomerge Release-5.0-EarlyAccess

[CL 15779579 by Guillaume Abadie in ue5-main branch]
2021-03-23 12:51:07 -04:00
christopher waters
27ed3a0897 Changing more shader compilers to export shader debug data in a more unified manner.
#jira UECON-373
#rb david.harvey, eric.mcdaniel, lukas.hermanns

[CL 15000043 by christopher waters in ue5-main branch]
2021-01-06 12:47:18 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Josh Adams
a1c02e63bb - Allow for "-run=CookGlobalShaders -platform=<plat> -deploy -reload" commandlet to work to xbox family platforms
#rb stu.mckenna,david.harvey
#fyi david.harvey

[CL 14114776 by Josh Adams in ue5-main branch]
2020-08-14 13:15:50 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00