Commit Graph

108 Commits

Author SHA1 Message Date
Sebastien Hillaire
921c0c6e31 Strata: now uses max byte per pixel
Green preflight

#rb Charles.deRousiers

[CL 14795822 by Sebastien Hillaire in ue5-main branch]
2020-11-20 10:08:04 -04:00
Zabir Hoque
013a1da2cb Missed files part of prior check in.
[CL 14639477 by Zabir Hoque in ue5-main branch]
2020-11-02 23:00:30 -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
Ben Ingram
3e62b2de7c Allow UnfrozenCopy to copy data that was frozen with FPlatformLayoutParameters that are different from the current/local platform
- This is used to allow editor to load cooked materials/shader maps
- Remove UE_FORCE_64BIT_MEMORY_IMAGE_POINTERS, and instead always force memory image ptrs to be 64bits...this simplifies some code, and plan is to remove 32bit support at some point anyway
- Frozen memory image pointers only need 32bits for offset, which leaves another 32bits to stash a type identifier...this allows us to interpret that frozen data being referenced, even it's packed for a different platform
#jira UE-91444
#rb arciel.rekman

[CL 14592392 by Ben Ingram in ue5-main branch]
2020-10-27 16:35:01 -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
Sebastien Hillaire
9d90cc63c6 First Strata checkin
- added cvar to enable it
- exemple of buffer and texture created and written to from BasePass

#rb Charles.DeRousiers

[CL 14326107 by Sebastien Hillaire in ue5-main branch]
2020-09-16 04:20:36 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -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
Michal Valient
95d19f95b1 [REVERB] Merging //UE4/Private-Reverb-Development@13832732
#rb graham.wihlidal, rune.stubbe, brian.karis, andrew.lauritzen, jeff.farris

[CL 13834854 by Michal Valient in ue5-main branch]
2020-07-06 18:58:26 -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
zach bethel
e1b294c522 Fixed edge case in FShaderParameterMapInfo that would have caused collisions.
#rb trivial

#ROBOMERGE-SOURCE: CL 13148997 via CL 13149004 via CL 13149022 via CL 13149029
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v688-13145358)

[CL 13149030 by zach bethel in Main branch]
2020-05-04 11:44:25 -04:00
zach bethel
881707f113 Removed FShaderParameterMap::operator== call from MeshDrawShaderBindings to remove the implicit FShader* indirection from the cached MDC hash map.
#rb Ben.Ingram, Arne.Schobe

#ROBOMERGE-SOURCE: CL 13131316 via CL 13131319 via CL 13131323 via CL 13131343
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v687-13115495)

[CL 13131354 by zach bethel in Main branch]
2020-04-30 17:13:50 -04:00
ben ingram
37a9216d19 #jira none
Add freezable hash table, use to accelerate lookup of shaders within ShaderMap
- Shaders are searched by TypeName and PermutationId, so move those fields out of FShader and into separate arrays inside ShaderMap, to reduce cache misses while finding shaders
#rb none

#ROBOMERGE-OWNER: ben.ingram
#ROBOMERGE-AUTHOR: ben.ingram
#ROBOMERGE-SOURCE: CL 13053391 in //UE4/Release-4.25/... via CL 13053394 via CL 13053520
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13053522 by ben ingram in Main branch]
2020-04-27 22:11:56 -04:00
Ben Ingram
66944fbb51 Fix merge of shader changes from Release-4.25 combined with optimizations from FN
#rb none

[CL 12960787 by Ben Ingram in Main branch]
2020-04-21 15:57:02 -04:00
ben ingram
45dc6407f3 #jira UE-92268
Allow FShader::Finalize to be called multiple times, ensure index doesn't change
#rb none

#ROBOMERGE-SOURCE: CL 12958102 in //UE4/Release-4.25/... via CL 12958109 via CL 12959154
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12959964 by ben ingram in Main branch]
2020-04-21 15:23:53 -04:00
ben ingram
68fbb75271 #jira UE-92139
Fix issues causing material DDC values to be non-determinisic
- Shader code within resources sorted by hash
- Debug source code values sorted by type
Also add mechanism to serialize any MemoryLayout described type to string
- Makes it easier to inspect material data to find sources of non-determinism
#rb none

#ROBOMERGE-OWNER: ben.ingram
#ROBOMERGE-AUTHOR: ben.ingram
#ROBOMERGE-SOURCE: CL 12944988 in //UE4/Release-4.25/... via CL 12944998 via CL 12957822
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12957827 by ben ingram in Main branch]
2020-04-21 13:46:17 -04:00
ben ingram
d9d0535ddc Add freezable hash table, use to accelerate lookup of shaders within ShaderMap
- Shaders are searched by TypeName and PermutationId, so move those fields out of FShader and into separate arrays inside ShaderMap, to reduce cache misses while finding shaders
#rb none

#ROBOMERGE-OWNER: ben.ingram
#ROBOMERGE-AUTHOR: ben.ingram
#ROBOMERGE-SOURCE: CL 12646854 via CL 12646966 via CL 12646981
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12646995 by ben ingram in Main branch]
2020-04-06 21:12:18 -04:00
ben ingram
eb819d2d9f Cache hashed filename on FShaderType, avoid semi-expensive TCHAR*->FName->FHashedName conversion when looking up global shaders
#rb none

#ROBOMERGE-SOURCE: CL 12579879 via CL 12579892 via CL 12579904
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12579927 by ben ingram in Main branch]
2020-04-02 18:01:08 -04:00
zabir hoque
c0d645c05f Expose AllowShaderWorkers to cvars as well.
#rb: Rolando.Caloca
#jira: none

#ROBOMERGE-SOURCE: CL 12491544 in //UE4/Release-4.25/... via CL 12491551 via CL 12491558
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12491562 by zabir hoque in Main branch]
2020-03-30 18:23:49 -04:00
Jules Blok
d7efe1e9f1 Consolidate single-pass stereo options under a Multi-View option
Fixes invalid combinations of single-pass techniques resulting in shader compiling errors

#jira UE-89646
#rb Steve.Smith

#ROBOMERGE-OWNER: Jules.Blok
#ROBOMERGE-AUTHOR: jules.blok
#ROBOMERGE-SOURCE: CL 12384522 in //UE4/Release-4.25/... via CL 12384524
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12385996 by Jules Blok in Main branch]
2020-03-23 23:06:35 -04:00
john hable
0eaa4fa2e4 Forcing pre-exposure to always be enabled in the shaders.
#jira ue-90726
#rb uriel.doyon

#ROBOMERGE-SOURCE: CL 12232768 in //UE4/Release-4.25/... via CL 12232770
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v664-12234175)

[CL 12234779 by john hable in Main branch]
2020-03-17 15:11:24 -04:00
juan canada
7c7ce0d2a1 Added options to turn off compilation of ray tracing material closest or any-hit shaders. This may be useful for titles that use custom shaders or don't require full material evaluation (i.e. only using ray tracing for shadows or AO).
New CVars:
- r.RayTracing.CompileMaterialCHS (default 1)
- r.RayTracing.CompileMaterialAHS (default 1)

The value is read-only and must match between cook-time and run-time.

#rb Krzysztof.Narkowicz
[FYI] Yuriy.ODonnell
#jira UE-90463

#ushell-cherrypick of 11541300 by Yuriy.ODonnell

#ROBOMERGE-SOURCE: CL 12202891 in //UE4/Release-4.25/... via CL 12202949
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v662-12191386)

[CL 12203392 by juan canada in Main branch]
2020-03-16 11:37:25 -04:00
wei liu
036bc781c6 Fix a bug that we don't recompile global shader after turn on/off MobileHDR
#jira UE-89822

#rb jack.porter, dmitriy.dyomin, mi.wang


#ROBOMERGE-SOURCE: CL 11850481 in //UE4/Release-4.25/... via CL 11850482
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11850703 by wei liu in Main branch]
2020-03-02 21:52:14 -05:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00