Commit Graph

137 Commits

Author SHA1 Message Date
rolando caloca
2cf885b9f5 UE5 - Minor refactor in prep for other changes
#rb Lukas.Hermanns

#ROBOMERGE-SOURCE: CL 15370980 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15370995 by rolando caloca in ue5-main branch]
2021-02-09 17:40:13 -04:00
lukas hermanns
2fb43751e2 Always read DLL file to hash DXC version.
#author Yuriy.ODonnell
#rb Lukas.Hermanns
#jira none
#rnx

#ROBOMERGE-SOURCE: CL 15341050 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15341057 by lukas hermanns in ue5-main branch]
2021-02-05 15:45:40 -04:00
lukas hermanns
a59c5021e7 Add missing #include directive in DXCWrapper.cpp.
#rb none
[FYI] Yuriy.ODonnell
#jira UE-107871
#rnx

#ROBOMERGE-SOURCE: CL 15340670 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15340674 by lukas hermanns in ue5-main branch]
2021-02-05 15:18:17 -04:00
Lukas Hermanns
a4dfdcd0ad Moved dxil.dll from DirectX folder into ShaderConductor binary folder and load dxil.dll manually to ensure it's always loaded from that location.
#rb Yuriy.ODonnell, Emil.Persson, Kenzo.Terelst
#fyi Mihnea.Balta, Rolando.Caloca, Graham.Wihlidal
#jira none
#rnx

[CL 15337426 by Lukas Hermanns in ue5-main branch]
2021-02-05 10:29:11 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
Yuriy ODonnell
8789e0bb07 Include shader compiler DLL version in FShaderFormatD3D/Vulkan::GetVersion(), similar to how it's done for other platforms.
#rb Lukas.Hermanns

[CL 15276007 by Yuriy ODonnell in ue5-main branch]
2021-02-01 18:54:58 -04:00
Lukas Hermanns
829eddd5cf Added HlslccHeaderWriter to unify writing of shader meta data.
#rb Mihnea.Balta, Will.Damon, Dmitriy.Dyomin
#fyi Rolando.Caloca, Brian.White
#jira none
#rnx

[CL 15225002 by Lukas Hermanns in ue5-main branch]
2021-01-27 17:53:40 -04:00
Tim Smith
4c3942091b Fixing PVS 7.7 Issues:
warning V547: Expression 'XYZ' is always true/false.

#rb trivial
#jira UE-91644

[CL 15054368 by Tim Smith in ue5-main branch]
2021-01-12 16:15:34 -04:00
Lukas Hermanns
32e30bfa9e Moved FShaderConductorContext into dedicated source files.
#rb none
#fyi Rolando.Caloca, Mihnea.Balta
#jira none
#rnx

[CL 14879107 by Lukas Hermanns in ue5-main branch]
2020-12-08 11:40:10 -04:00
zach bethel
0d7dc4d4ed Refactor of uniform buffer binding to allow for runtime selection of static or per-shader binding. This is a necessary precursor to moving the View uniform buffer to use static bindings on mesh passes; it is used in so many places that both binding models are required to preserve compatibility. Added validation to catch when a uniform buffer is bound using both methods at the same time. Added CVar to RHI transition validation to control whether to break in the debugger on a transition failure.
#rb christopher.waters

[CL 14873973 by zach bethel in ue5-main branch]
2020-12-07 17:42:32 -04:00
Lukas Hermanns
5acb4c83b6 DXC Update: SCW backends.
#rb none
#fyi Mihnea.Balta, Rolando.Caloca, Will.Damon, Jonas.Meyer, Michael.Sartain
#jira none
#rnx

[CL 14832278 by Lukas Hermanns in ue5-main branch]
2020-12-01 19:33:51 -04:00
zach bethel
ffe8799e1b Backing out shader compilation change in order to do more testing.
#rb none

[CL 14809886 by zach bethel in ue5-main branch]
2020-11-24 12:14:57 -04:00
zach bethel
8137732573 Fixed 0 hash in shader compiler for uniform buffers without resources.
#fyi rolando.caloca

[CL 14809823 by zach bethel in ue5-main branch]
2020-11-24 11:55:08 -04:00
Lukas Hermanns
9e7053fd6c Fix Vulkan tessellation in DXC: use shader output slots to commuincate patch constant data in Hull shaders (Merged from CL 14680863).
#rb Rolando.Caloca, Will.Damon
#fyi Jonas.Meyer, Mihnea.Balta, Graham.Wihlidal
#rnx

[CL 14714790 by Lukas Hermanns in ue5-main branch]
2020-11-10 18:35:10 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -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
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -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
rolando caloca
0325fe0ba6 UE4.25 - Fix bad module dependencies
#rb none
#rnx
#jira
#lockdown Marcus.Wassmer

#ROBOMERGE-SOURCE: CL 12874924 in //UE4/Release-4.25/... via CL 12874991 via CL 12875005
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12875015 by rolando caloca in Main branch]
2020-04-16 18:37:33 -04:00
rolando caloca
d1c7cbbd16 UE4.25 - Disambiguates crashes from inside a platform shader compiler
#rb Lukas.Hermanns
#rnx
#jira UE-79375
#lockdown Marcus.Wassmer

#ROBOMERGE-SOURCE: CL 12872434 in //UE4/Release-4.25/... via CL 12872446 via CL 12872449
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12872452 by rolando caloca in Main branch]
2020-04-16 16:36:56 -04:00
Lukas Hermanns
bc49934d32 Merging
//UE4/Dev-Rendering/Engine/Source/Developer/ShaderCompilerCommon/Private/ShaderCompilerCommon.cpp

to //UE4/Main/Engine/Source/Developer/ShaderCompilerCommon/Private/ShaderCompilerCommon.cpp

#rb none
#fyi Will.Damon, Matt.Collins
#jira UE-87533
#rnx

[CL 11122913 by Lukas Hermanns in Main branch]
2020-01-27 18:02:21 -05:00
Rolando Caloca
bbb9564388 Copying //UE4/Dev-RenderPlat-Staging@11110326 to //UE4/Main
#rb none
#rnx

[CL 11110369 by Rolando Caloca in Main branch]
2020-01-24 18:07:01 -05:00
ryan durand
471d972e62 Updating copyright for Engine Developer.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870584 by ryan durand in Main branch]
2019-12-26 15:32:37 -05:00
Stefan Boberg
d2f9a61b06 Copy-up from Dev-Core
#rb none

[CL 10419044 by Stefan Boberg in Main branch]
2019-11-25 12:03:09 -05:00