Commit Graph

122 Commits

Author SHA1 Message Date
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
andrew davidson
57beb335f2 Merging //UE5/Dev-LargeWorldCoordinates [at] 17581892 to //UE5/Main
#ROBOMERGE-AUTHOR: andrew.davidson
#ROBOMERGE-SOURCE: CL 17595295 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v871-17566257)

[CL 17595306 by andrew davidson in ue5-release-engine-test branch]
2021-09-22 10:01:48 -04:00
ben ingram
c0a303be42 Continuation of previous material parameter refactor. Replace FMaterialRenderProxy Scalar/Vector/Texture parameter query functions with generic version
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 17378446 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17378452 by ben ingram in ue5-release-engine-test branch]
2021-08-31 17:38:39 -04:00
dmytro vovk
fe6369b9ca Fixed SSE Math double precision issues
#jira none
#rb Zak.Middleton

#ROBOMERGE-SOURCE: CL 17033934 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v846-17029325)

[CL 17035634 by dmytro vovk in ue5-release-engine-test branch]
2021-08-03 14:44:57 -04:00
sebastien lussier
55ec68c759 FMaterialBakingHelpers::PerformUVBorderSmearAndShrink() should shrink images regardless of the number of smearing iterations
#rb daniel.coelho, patrick.enfedaque

#ROBOMERGE-SOURCE: CL 16837508 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16837515 by sebastien lussier in ue5-release-engine-test branch]
2021-07-13 10:56:04 -04:00
jeanfrancois dube
12e850ac12 Reduce the impact of wrapped pointers by 75% from material code.
For example, texture streaming spikes drops from 26.7ms to 16.6ms in PIE.

#rb zousar.shaker


#ROBOMERGE-SOURCE: CL 16571356
#ROBOMERGE-BOT: (v828-16531559)

[CL 16571408 by jeanfrancois dube in ue5-main branch]
2021-06-07 11:35:07 -04:00
sebastien lussier
412cf1d7a1 MaterialBaking - Use correct linear bake for all texture property by default
Providing a new flatten material with the correct texture samplers.
Retrieve texture properties from the default textures in the material (linear vs srgb, compression, vt enabled, lod group...)

Previously generated material instances are unchanged.
All MergeActor engine tests pass successfully.

#rb patrick.enfedaque

#ROBOMERGE-SOURCE: CL 16484038 in //UE5/Private-Frosty/...
#ROBOMERGE-BOT: STARSHIP (Private-Frosty -> Main) (v823-16466674)

[CL 16484318 by sebastien lussier in ue5-main branch]
2021-05-27 10:31:36 -04:00
sebastien lussier
3b200ed189 PR #7916: Lucasfilm: MaterialBaking: Fixes and improvements for material baking (Contributed by lflecunneen)
- Fixes for baking decal materials
- Option to return full HDR emissive color value
- Option to make all values linear by default, except for colors
#jira UE-115192
#rb sebastien.lussier

#ushell-cherrypick of 16289332 by ben.ingram
#ushell-cherrypick of 16373665 by sebastien.lussier
#ushell-cherrypick of 16413094 by sebastien.lussier

#ROBOMERGE-SOURCE: CL 16480669 in //UE5/Private-Frosty/...
#ROBOMERGE-BOT: STARSHIP (Private-Frosty -> Main) (v823-16466674)

[CL 16480676 by sebastien lussier in ue5-main branch]
2021-05-27 00:01:31 -04:00
sebastien lussier
2908eb8a97 Fix MaterialBaking when using SetLinearBake(true)
#jira none
#rb daniel.coelho

#ROBOMERGE-SOURCE: CL 16413052 in //UE4/Release-4.27/... via CL 16413074
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v804-16311228)

[CL 16413094 by sebastien lussier in ue5-release-engine-staging branch]
2021-05-20 20:13:27 -04:00
sebastien lussier
1beda36984 #jira UE-115749
Material baking changes in CL 16278086 modified the default baking behavior
#rb patrick.enfedaque

#ROBOMERGE-SOURCE: CL 16368157 in //UE4/Release-4.27/... via CL 16368168
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v804-16311228)

[CL 16373665 by sebastien lussier in ue5-release-engine-staging branch]
2021-05-18 15:14:09 -04:00
ben ingram
d992cf59ea PR #7916: Lucasfilm: MaterialBaking: Fixes and improvements for material baking (Contributed by lflecunneen)
- Fixes for baking decal materials
- Option to return full HDR emissive color value
- Option to make all values linear by default, except for colors
#jira UE-115192
#rb sebastien.lussier

#ROBOMERGE-OWNER: ben.ingram
#ROBOMERGE-AUTHOR: ben.ingram
#ROBOMERGE-SOURCE: CL 16278086 in //UE4/Release-4.27/... via CL 16278111
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v799-16237190)
#ROBOMERGE-CONFLICT from-shelf

[CL 16289332 by ben ingram in ue5-release-engine-staging branch]
2021-05-11 21:18:15 -04:00
Andrew Davidson
3ddc3a4da3 Merge up from //UE5/Dev-LargeWorldCoordinates
#rb none

[CL 16211417 by Andrew Davidson in ue5-main branch]
2021-05-05 15:07:25 -04:00
Sebastien Lussier
4466a8228a MaterialBaking - Cap smearing iterations to avoid extreme processing time on high resolution baked textures
#rb patrick.enfedaque

[CL 16011101 by Sebastien Lussier in ue5-main branch]
2021-04-14 15:49:40 -04:00
julien stjean
7b1ad76601 Fixed crash when baking a material for export from a mac.
From my observation Metal doesn't like copying a texture that is SRGB to one that is not SRGB.

#jira UE-109650
#rb Ben.Ingram
#lockdown Simon.Tourangeau

#ROBOMERGE-SOURCE: CL 15954119 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v787-15839533)

[CL 15971504 by julien stjean in ue5-main branch]
2021-04-10 10:03:45 -04:00
benoit deschenes
63aef69676 Remove SCOPED_SUSPEND_RENDERING_THREAD from OBJs exporter
Alexis.Matte
#rb Alexis.Matte
#jira UE-106965

#ROBOMERGE-SOURCE: CL 15915705 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15920146 by benoit deschenes in ue5-main branch]
2021-04-05 14:19:15 -04:00
Sebastien Lussier
06ccaf7c69 Optimized proxy mesh generation
* Added GroupIdenticalMeshesForBaking, which, when activated, will result in identical meshes (or mesh instances) being baked only once.

Other changes/fixes
* Always rely on the StaticMesh RenderData when retrieving mesh description for mesh merging/simplification (was the case when retrieving from a SMC, now also the case for a SM).
* For some reason, Material baking was rendering each triangle twice, but with opposite facing. Uneeded as we are rendering with backface culling disabled.

[CL 15669055 by Sebastien Lussier in ue5-main branch]
2021-03-10 15:46:29 -04:00
jason nadro
af442b563e [ODSC] - Properly initialize compiled shader maps with the editor only flag.
GetCurrentShaderPermutationFlags was being called which will always return the editor only data flag regardless of what platform we are cooking for which is the wrong behavior.  I've changed this call to be GetShaderPermutationFlags which will check the layout parameters's flag for editor only data which will have per-platform information.

- Pass in TargetPlatform so we don't create the MaterialID as the current platform (in this case the cooker) which would be wrong.
- Pass LayoutParams to GetDependentShaderAndVFTypes so it can pass the appropriate editor only data flag into ShouldCompilePermutation.

#rb Arciel.Rekman
[at]Arciel.Rekman, [at]Ben.Ingram
#jira UE-106214

#ROBOMERGE-SOURCE: CL 15587457 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v777-15581079)

[CL 15587467 by jason nadro in ue5-main branch]
2021-03-03 16:56:02 -04:00
Sebastien Lussier
97c13a68a2 Readd parallelism in FMaterialBakingHelpersImpl::PerformUVBorderSmear()
#fyi richard.malo
#robomerge Release-5.0-EarlyAccess

[CL 15532376 by Sebastien Lussier in ue5-main branch]
2021-02-25 15:45:47 -04:00
Sebastien Lussier
c5173400fa MaterialBaking module - cleanup cached material proxies upon module shutdown & GC collect passes
#rb patrick.enfedaque
#robomerge Release-5.0-EarlyAccess

[CL 15419698 by Sebastien Lussier in ue5-main branch]
2021-02-16 13:37:31 -04:00
Sebastien Lussier
318627a8ef MaterialBaking - Removed parallelism in PerformUVSmear as it is actually degrading performance (really small workloads) & we've now parallelized more parts of the material baking process
#rb patrick.enfedaque
#robomerge Release-5.0-EarlyAccess

[CL 15419689 by Sebastien Lussier in ue5-main branch]
2021-02-16 13:37:12 -04:00
Emil Persson
4516b985df Name all resources and make naming mandatory
#rb yuriy.odonnel, kenzo.terelst

[CL 15416919 by Emil Persson in ue5-main branch]
2021-02-16 08:37:39 -04:00
Sebastien Lussier
4446f8d376 MaterialBaking - Fixed FMaterialBakingModule::CleanupMaterialProxies() deleting the material proxy on the wrong thread
#rb julien.lheureux

[CL 15217150 by Sebastien Lussier in ue5-main branch]
2021-01-27 10:11:22 -04:00
zach bethel
a2bc3ea0f8 Converted canvas rendering to RDG.
#rb christopher.waters
#jira UE-106330

[CL 15157078 by zach bethel in ue5-main branch]
2021-01-21 14:46:38 -04:00
Emil Persson
adf0716e8d Replace FVertexBufferRHIRef, FIndexBufferRHIRef and FStructuredBufferRHIRef with FBufferRHIRef.
#rb kenzo.terelst

[CL 15153257 by Emil Persson in ue5-main branch]
2021-01-21 07:06:03 -04:00
Tim Smith
d193b70a3b Fixing PVS 7.7 Issues:
warning V781: The value of the 'XYZ' index is checked after it was used. Perhaps there is a mistake in program logic.

#rb trivial
#jira UE-91644

[CL 15066377 by Tim Smith in ue5-main branch]
2021-01-13 09:08:55 -04:00