Commit Graph

63 Commits

Author SHA1 Message Date
lukas hermanns
879487fc54 ShaderConductor Linux build script: Add standalone tool ShaderConductorCmd to Engine/Binaries folder.
#rb Brandon.Schaefer
[FYI] Michael.Sartain
#jira none
#rnx

#ROBOMERGE-SOURCE: CL 16368807 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v804-16311228)

[CL 16368866 by lukas hermanns in ue5-release-engine-test branch]
2021-05-18 12:01:35 -04:00
lukas hermanns
f533801683 ShaderConductor Mac build script: also copy standalone tool ShaderConductorCmd to Engine/Binaries folder.
#rb Will.Damon
[FYI] Dave.Hunter
#jira none
#rnx

#ROBOMERGE-SOURCE: CL 16368580 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v804-16311228)

[CL 16368772 by lukas hermanns in ue5-release-engine-test branch]
2021-05-18 11:59:05 -04:00
lukas hermanns
e0d4301b68 Add '#line'-directive to custom HLSL rewriter in ShaderConductor.
#rb Rolando.Caloca, Will.Damon
[FYI] Ryan.Vance, Carl.Lloyd
#jira none
#rnx

#ROBOMERGE-SOURCE: CL 16367768 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v804-16311228)

[CL 16367772 by lukas hermanns in ue5-release-engine-test branch]
2021-05-18 11:17:41 -04:00
Marc Audy
f02d489290 Update Release-Engine-Test from Release-Engine-Staging @ 16264272
[CL 16264458 by Marc Audy in ue5-release-engine-test branch]
2021-05-11 01:10:20 -04:00
Lukas Hermanns
c6110bf031 DXC Update (6/7): DirectXShaderCompiler
#rb none
#fyi Will.Damon, Mihnea.Balta, Ryan.Vance, Carl.Lloyd, Rolando.Caloca, Michael.Sartain
#jira none
#rnx

[CL 16211050 by Lukas Hermanns in ue5-main branch]
2021-05-05 14:43:08 -04:00
Lukas Hermanns
6287ca7281 DXC Update (5/7): SPIRV-Cross
#rb none
#fyi Will.Damon, Mihnea.Balta, Ryan.Vance, Carl.Lloyd, Rolando.Caloca, Michael.Sartain
#jira none
#rnx

[CL 16211024 by Lukas Hermanns in ue5-main branch]
2021-05-05 14:42:11 -04:00
Lukas Hermanns
5234703cc8 DXC Update (4/7): SPIRV-Tools
#rb none
#fyi Will.Damon, Mihnea.Balta, Ryan.Vance, Carl.Lloyd, Rolando.Caloca, Michael.Sartain
#jira none
#rnx

[CL 16211004 by Lukas Hermanns in ue5-main branch]
2021-05-05 14:41:46 -04:00
Lukas Hermanns
b570d4022f DXC Update (3/7): SPIRV-Headers
#rb none
#fyi Will.Damon, Mihnea.Balta, Ryan.Vance, Carl.Lloyd, Rolando.Caloca, Michael.Sartain
#jira none
#rnx

[CL 16210986 by Lukas Hermanns in ue5-main branch]
2021-05-05 14:40:52 -04:00
Lukas Hermanns
7c7652aa41 DXC Update (2/7): googletest
#rb none
#fyi Will.Damon, Mihnea.Balta, Ryan.Vance, Carl.Lloyd, Rolando.Caloca, Michael.Sartain
#jira none
#rnx

[CL 16210969 by Lukas Hermanns in ue5-main branch]
2021-05-05 14:40:27 -04:00
Lukas Hermanns
e54abe012e DXC Update (1/7): cxxopts
#rb none
#fyi Will.Damon, Mihnea.Balta, Ryan.Vance, Carl.Lloyd, Rolando.Caloca, Michael.Sartain
#jira none
#rnx

[CL 16210964 by Lukas Hermanns in ue5-main branch]
2021-05-05 14:39:58 -04:00
Lukas Hermanns
c2eda93a8d Refactor SPIR-V patching and strip debug instructions for Vulkan mobile except OpName instructions in --strip-reflect pass as UE always needs this reflection information.
Rebuild ShaderConductor for Win64, Mac, Linux.

#rb Carl.Lloyd, Rolando.Caloca, Ryan.Vance
#fyi Mihnea.Balta, Will.Damon, Dmitriy.Dyomin, Michael.Sartain, Brandon.Schaefer
#jira none
#rnx

[CL 16186169 by Lukas Hermanns in ue5-main branch]
2021-05-03 15:22:38 -04:00
Lukas Hermanns
ce4fe44718 Replace '-fcolor-diagnostics' with '-fdiagnostics-color' in DXC's CMake module to get ShaderConductor to build on Linux.
#rb Michael.Sartain, Will.Damon
#fyi Carl.Lloyd
#jira none
#rnx

[CL 16184861 by Lukas Hermanns in ue5-main branch]
2021-05-03 12:20:23 -04:00
Lukas Hermanns
50c9f9c059 Fix file casing for SPIRV files (2/2).
#rb none
#fyi Michael.Sartain, Brandon.Schaefer
#jira none
#rnx

[CL 16173291 by Lukas Hermanns in ue5-main branch]
2021-04-30 17:15:08 -04:00
Lukas Hermanns
48327d03e2 Fix file casing for SPIRV files (1/2).
#rb none
#fyi Michael.Sartain, Brandon.Schaefer
#jira none
#rnx

[CL 16173274 by Lukas Hermanns in ue5-main branch]
2021-04-30 17:13:57 -04:00
Ryan Vance
aacfa50a0d Initial shader compilation changes to support VKRT.
#rb Lukas.Hermanns, Rolando.Caloca

[CL 16098805 by Ryan Vance in ue5-main branch]
2021-04-22 17:38:43 -04:00
Lukas Hermanns
dc07d3f58e Add "Disassemble" function to public interface of ShaderConductor.
Move ShaderConductor utility to disassemble SPIR-V into ShaderCompilerCommon module.
Fix --strip-reflect pass in SPIRV-Tools to remove all SPV_GOOGLE* reflection extensions.
Rebuild ShaderConductor for Win64, Linux, and Mac.

#rb Carl.Lloyd, Ryan.Vance
#fyi Mihnea.Balta, Rolando.Caloca, Will.Damon, Dmitriy.Dyomin
#jira none
#rnx

[CL 15978123 by Lukas Hermanns in ue5-main branch]
2021-04-12 11:25:06 -04:00
Lukas Hermanns
5dabdd3014 Merged updated ShaderConductor source from //UE5/Main into //UE5/Release-5.0-EarlyAccess.
#rb none
[FYI] Mihnea.Balta, Rolando.Caloca, Ryan.Vance, Carl.Lloyd, Will.Damon, Brandon.Schaefer
#jira none
#rnx

#ROBOMERGE-OWNER: Lukas.Hermanns
#ROBOMERGE-AUTHOR: lukas.hermanns
#ROBOMERGE-SOURCE: CL 15916911 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
#ROBOMERGE-CONFLICT from-shelf

[CL 15920922 by Lukas Hermanns in ue5-main branch]
2021-04-05 14:54:50 -04:00
Lukas Hermanns
2e1fb14cb7 Add "Optimize" function to public interface of ShaderConductor to perform SPIR-V optimizations *after* shader reflection (e.g. to strip reflection extensions).
#rb Carl.Lloyd, Will.Damon
#fyi Ryanc.Vance, Mihnea.Balta, Rolando.Caloca, Michael.Sartain, Brandon.Schaefer
#jira none
#rnx

[CL 15850443 by Lukas Hermanns in ue5-main branch]
2021-03-29 09:45:48 -04:00
Lukas Hermanns
5bd7e2e6ff Updated TPS and license files for ShaderConductor.
#rb Petra.Pintar
#jira none
#rnx

[CL 15435861 by Lukas Hermanns in ue5-main branch]
2021-02-17 12:00:44 -04:00
Lukas Hermanns
7b754b50e6 Rebuild ShaderConductor for Win64, Mac, and Linux with SM6.6 support in DXC build. Updated ShaderConductor source in CL 15394233.
#rb none
#fyi Mihnea.Balta, Rolando.Caloca, Yuriy.ODonnell, Emil.Persson, Graham.Wihlidal, Will.Damon, Michael.Sartain, Brandon.Schaefer
#jira none

[CL 15394396 by Lukas Hermanns in ue5-main branch]
2021-02-11 20:33:29 -04:00
Lukas Hermanns
03d248b992 Updated ShaderConductor and its dependencies:
- Updated SPIRV-Headers to rev. faa570a
- Updated SPIRV-Tools to rev. f11f743
- Updated SPIRV-Cross to rev. 4741bba
- Updated googletest to rev. 273f8cb
- Updated cxxopts to rev. e862445
- Updated DXC to rev. 63fcca6
- Updated ShaderConductor to rev. 30a77c7

#rb none
#fyi Mihnea.Balta, Rolando.Caloca, Yuriy.ODonnell, Emil.Persson, Graham.Wihlidal, Will.Damon, Michael.Sartain, Brandon.Schaefer, Carl.Lloyd
#jira none

[CL 15394233 by Lukas Hermanns in ue5-main branch]
2021-02-11 20:11:00 -04:00
Michael Trepka
1328d0f57e Mac version of ShaderConductor updated to use @rpath when needed for manually loading libdxcompiler.dylib
For reference, it's the same code change as 15379169 in //UE4/Main, applied to the newer SC version here

#rb Lukas.Hermanns
#fyi Lukas.Hermanns
#jira UE-108334

[CL 15388027 by Michael Trepka in ue5-main branch]
2021-02-11 11:44:00 -04:00
will damon
d197e24574 Restore SPIRV-Cross UE identity workaround for metal compiler bug.
#rb lukas.hermanns
#jira UE-107840
#rnx

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

[CL 15368920 by will damon in ue5-main branch]
2021-02-09 15:02:37 -04:00
Lukas Hermanns
d6ab41f54b Added "-debug" option to Build_ShaderConductor_Linux.sh script.
#rb Brandon.Schaefer
#fyi Michael.Sartain
#jira none
#rnx

[CL 15356990 by Lukas Hermanns in ue5-main branch]
2021-02-08 12:00:09 -04:00
Michael Sartain
b89a74ef36 Part twoof SPIRV filename case fixes
#jira none
#rb Lukas.Hermanns

[CL 15338229 by Michael Sartain in ue5-main branch]
2021-02-05 11:47:39 -04:00