Commit Graph

1475 Commits

Author SHA1 Message Date
christopher waters
f12afe6c73 Deprecating RHICreateTexture2DArray, RHICreateTexture3D, RHICreateTextureCube, RHICreateTextureCubeArray.
Converted a few additional RHICreateTexture2D calls to RHICreateTexture.
Adding a few more FRHITextureCreateDesc::CreateXXX variants to quickly specify extents and formats.
Merging FTextureRWBuffer2D and FTextureRWBuffer3D into a single class FTextureRWBuffer and deprecated the old ones.

#jira none
#rb luke.thatcher
#preflight 62448deb927e60e3415508e5

[CL 19560161 by christopher waters in ue5-main branch]
2022-03-30 13:36:17 -04:00
michael balzer
24461121a1 Landscape: Resurrect Landscape.DumpLODs console command functionality
#preflight 623e50fb610771b0f5b1a69e
#rb jonathan.bard

[CL 19559571 by michael balzer in ue5-main branch]
2022-03-30 13:14:58 -04:00
michael balzer
a942806ea1 Landscape: Change LogLandscape default verbosity from Warning to Log
#preflight 623e4e9f6d39f6b5a0622c12
#rb jonathan.bard

[CL 19542148 by michael balzer in ue5-main branch]
2022-03-29 10:50:47 -04:00
dmitriy dyomin
d5741f624b Added option to disable usage of a baked landscape mesh on mobile platforms (r.Mobile.LandscapeMesh)
#rb jack.porter

#ROBOMERGE-OWNER: dmitriy.dyomin
#ROBOMERGE-AUTHOR: dmitriy.dyomin
#ROBOMERGE-SOURCE: CL 19528072 via CL 19528235 via CL 19528695 via CL 19528703
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v937-19513599)

[CL 19532768 by dmitriy dyomin in ue5-main branch]
2022-03-28 16:28:57 -04:00
jonathan bard
96026e2cc8 Properly account for landscape collision components in memory reports
#preflight 62338731e12e0da4a5314977
#rb benn.gallagher

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 19500734 via CL 19500746 via CL 19504705 via CL 19504820
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v936-19480137)

[CL 19511227 by jonathan bard in ue5-main branch]
2022-03-25 09:13:19 -04:00
michael balzer
d2959cc79a Landscape: Resolve static analysis warning in LandscapeEditLayers.cpp
#jira UE-146921
#preflight 623bce4ec73745c600c5432b
#rb jonathan.bard

[CL 19496705 by michael balzer in ue5-main branch]
2022-03-24 11:50:59 -04:00
christina tempelaarl
d2e0e0b949 Roll back 19428408 fix for UE-145385 to see if this fixes crash opening map related to landscape splines.
#rb none
#pf none

#ROBOMERGE-AUTHOR: christina.tempelaarl
#ROBOMERGE-SOURCE: CL 19440014 via CL 19444868 via CL 19445683 via CL 19445738
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v930-19419903)

[CL 19445894 by christina tempelaarl in ue5-main branch]
2022-03-19 18:34:28 -04:00
christina tempelaarl
b83c64ad05 Fix landscape splines to maintain spline mesh vertex color upon minor updates.
#jira UE-145385
#rb jonathan.bard
#preflight 6233a502791d231e020a5663

#ROBOMERGE-AUTHOR: christina.tempelaarl
#ROBOMERGE-SOURCE: CL 19428408 via CL 19432329 via CL 19436724 via CL 19436824
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v930-19419903)

[CL 19442404 by christina tempelaarl in ue5-main branch]
2022-03-18 18:50:14 -04:00
jonathan bard
a5e071e72b Removed async task for computing landscape component LOD biases to fix race condition: the task was started at the beginning of the render thread frame and synced when starting to render view family/views. But the task was operating on UTextures, which could have their internal FTextureResource pointer updated within that lapse of time, leading to a crash if GetNumMips() / GetNumResidentMips() was executed at the same time
Furthermore, there's no per-view async task anymore so there was no point in kicking off that async task in BeginRenderViewFamily_RenderThread (which was the right thing to do, since at this point, FTextureResource pointers couldn't be modified by render commands happening between BeginFrame_RenderThread and BeginRenderViewFamily_RenderThread) and waiting after in that same function since no other parallel work was to be executed anyway. The job was less than 0.1ms on console anyway so the necessity to have this running asynchronously was questionable in the first place.

#rb sebastien.lussier
#preflight 62332ddbf41c515c37258422

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 19420534 via CL 19429013 via CL 19429156
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v930-19419903)

[CL 19432567 by jonathan bard in ue5-main branch]
2022-03-18 02:33:01 -04:00
semion piskarev
ddf6d3192b Multiple non-unity build fixes, mostly having to do with PDI.
#rb none
#jira UE-146349, UE-146335
#rnx
#preflight 62337597f101b8d0afa6c8d7

[CL 19423747 by semion piskarev in ue5-main branch]
2022-03-17 14:03:58 -04:00
bob tellez
1616e74ed4 Partial merge of 18585161 to finish the backout of 18394343 in FNMain
[FYI] Sebastien.Lussier,Jeremy.Moore

#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 19387136 via CL 19389475 via CL 19398546 via CL 19398611
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v926-19321884)

[CL 19403768 by bob tellez in ue5-main branch]
2022-03-16 03:47:18 -04:00
richard malo
8ad410579e Landscape using Brushes now forces its LS Streaming Proxies to also be loaded in editor (until partial loading of landscape proxies is properly supported when using BP brushes).
#rb patrick.enfedaque, jeanfrancois.dube, jonathan.bard
#preflight 622f4cb90a342dea04e8dda2

#ROBOMERGE-AUTHOR: richard.malo
#ROBOMERGE-SOURCE: CL 19384401 via CL 19384407
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v926-19321884)

[CL 19384754 by richard malo in ue5-main branch]
2022-03-15 09:55:25 -04:00
marc audy
a3275e4513 Move SystemGUIDs in to a cpp to avoid massive recompiles when changing
Convert landscape mobile cook version to system guid system
#jira
#rnx

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 19346370 via CL 19352300 via CL 19352991 via CL 19355735
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v926-19321884)

[CL 19357735 by marc audy in ue5-main branch]
2022-03-11 13:08:58 -05:00
jonathan bard
a3842f01e1 Added support for subsections in landscape edit layers local merge
#rb luc.eygasier
#preflight 6228ad81695c94f981cf0ce3

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 19319842 via CL 19320693 via CL 19323505 via CL 19323665
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v926-19321884)

[CL 19348040 by jonathan bard in ue5-main branch]
2022-03-10 21:51:08 -05:00
Max Whitehead
6596666da6 Make ScaledImplicit constructor require shared ptr for ref count, to reduce risk of copied implicit dropping shared pointer.
Fix copy functions not copying shared ptr, fixing incorrect lifetime of shared geometry.

#jira UE-145366
#preflight 622a867032749f363c5d1ad4
#rb chris.caulfield

[CL 19346862 by Max Whitehead in ue5-main branch]
2022-03-10 20:49:43 -05:00
sebastien lussier
2ee1117eec #jira UE-144062
Fortnite Client Crash in FStreamingRenderAsset::UpdateStaticData when attempting to start a match on Android.

#preflight 6226e2b6671c913c0502a891
#rb patrick.enfedaque

#ROBOMERGE-AUTHOR: sebastien.lussier
#ROBOMERGE-SOURCE: CL 19302517 in //UE5/Release-5.0/... via CL 19303828
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v926-19321884)

[CL 19346847 by sebastien lussier in ue5-main branch]
2022-03-10 20:48:38 -05:00
chris kulla
f4c4970e96 Unify GPU Lightmass shader selection with Path tracing
The logic was nearly identical between both cases, refactoring allows us to share more code and remove virtual calls from FRayTracingMeshProcessor.

Also cleanup the way supported Vertex Factory types are detected by adding a new vertex factory flag.

#rb Juan.Canada
#preflight 6227967d31133a23da4a56bf

[CL 19305870 by chris kulla in ue5-main branch]
2022-03-08 13:03:14 -05:00
fred kimberley
e7e64e1749 Make FVector conversions explicit.
#preflight 6221270ea00412627d0b7dd3
#jira UE-122078
#lockdown Julien.Marchand
#rb Andrew.Davidson

#ROBOMERGE-AUTHOR: fred.kimberley
#ROBOMERGE-SOURCE: CL 19253774 in //UE5/Release-5.0/... via CL 19257968
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v924-19243027)

[CL 19263535 by fred kimberley in ue5-main branch]
2022-03-04 03:48:53 -05:00
kihl
eaacba843b PR #7998: Added setting for contact shadows on grass (Contributed by kihl)
#jira UE-115252
#rb ola.olsson

#ROBOMERGE-AUTHOR: andrew.lauritzen
#ROBOMERGE-SOURCE: CL 19246725 via CL 19246893
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v924-19243027)

[CL 19262860 by kihl in ue5-main branch]
2022-03-04 03:00:01 -05:00
luc eygasier
643ed6eea9 Undo //UE5/Main/Engine/Source/... changelist 19235312
Fixes uninitialized member in FLandscapePerLODMaterialOverride

#rb Jonathan.Bard
#jira UE-144566
#preflight 6220c3397e0217a606ee7545

Original CL Desc
* Removed incomplete per-platform per-LOD level material overrides for landscape. The code isn't meant to support that since material instances are built at edit-time. We would need to somewhat hack it at cook time in order to regenerate (and recompile) the list of material instances per-platform, which is not a recommended thing to to in the engine. Instead, we choose to simply make the per-LOD level material overrides constant across platforms since the recommended way is to customize the material for platforms using material expressions such as Quality Level switc, Shading Path Switc or Feature Level Switc.
* Deprecated/merged FLandscapeComponentMaterialOverride and FLandscapeProxyMaterialOverride into FLandscapePerLODMaterialOverride since they were identical
* Fixed UpdateLayersMaterialInstances which, unlike UpdateMaterialInstances, didn't take into account per-component material overrides

[CL 19242882 by luc eygasier in ue5-main branch]
2022-03-03 08:55:00 -05:00
jonathan bard
10ec515f6a Build fix
#rb luc.eygasier

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 19223177 via CL 19235099 via CL 19235284 via CL 19235343
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19236308 by jonathan bard in ue5-main branch]
2022-03-02 20:50:52 -05:00
jonathan bard
3b1b65dac3 Fixed crash when using invalid scale factor on landscape copy/paste gizmo
#rb luc.eygasier
#jira UE-143188

#ROBOMERGE-AUTHOR: jonathan.bard
#ROBOMERGE-SOURCE: CL 19222950 via CL 19234926 via CL 19235047 via CL 19235058
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19236307 by jonathan bard in ue5-main branch]
2022-03-02 20:50:44 -05:00
eric mcdaniel
78d6c0d3f5 [Backout] - CL19230219
#rb none
#jira UE-144566
#preflight 62200fba943787f1d21ae8ae

#fyi luc.eygasier, Jonathan.Bard
Original CL Desc
-----------------------------------------------------------------
* Removed incomplete per-platform per-LOD level material overrides for landscape. The code isn't meant to support that since material instances are built at edit-time. We would need to somewhat hack it at cook time in order to regenerate (and recompile) the list of material instances per-platform, which is not a recommended thing to to in the engine. Instead, we choose to simply make the per-LOD level material overrides constant across platforms since the recommended way is to customize the material for platforms using material expressions such as Quality Level switc, Shading Path Switc or Feature Level Switc.
* Deprecated/merged FLandscapeComponentMaterialOverride and FLandscapeProxyMaterialOverride into FLandscapePerLODMaterialOverride since they were identical
* Fixed UpdateLayersMaterialInstances which, unlike UpdateMaterialInstances, didn't take into account per-component material overrides

From shelve 17931928 on behalf on Jonathan.Bard

#rb Jonathan.Bard
#jira UE-132031
#preflight 621cd5cd49723678579d9ec1

#ROBOMERGE-OWNER: luc.eygasier
#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 19221589 via CL 19223810 via CL 19223838 via CL 19226205
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19235312 by eric mcdaniel in ue5-main branch]
2022-03-02 20:08:32 -05:00
rob krajcarski
030deeb136 Fix for crash with landscapes when using -rhivalidation. Ensures that the RHIBuffer is held for the life of the frame because not all RHI backends will have the SRV maintain a hard reference to the source buffer
#jira UE-143221
#rb mihnea.balta
#preflight 621fcf56e15c51d8c50b9b9a
#lockdown michal.valient

#ROBOMERGE-AUTHOR: rob.krajcarski
#ROBOMERGE-SOURCE: CL 19228270 in //UE5/Release-5.0/... via CL 19229143
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19231609 by rob krajcarski in ue5-main branch]
2022-03-02 17:32:07 -05:00
luc eygasier
e78d41114a * Removed incomplete per-platform per-LOD level material overrides for landscape. The code isn't meant to support that since material instances are built at edit-time. We would need to somewhat hack it at cook time in order to regenerate (and recompile) the list of material instances per-platform, which is not a recommended thing to to in the engine. Instead, we choose to simply make the per-LOD level material overrides constant across platforms since the recommended way is to customize the material for platforms using material expressions such as Quality Level switc, Shading Path Switc or Feature Level Switc.
* Deprecated/merged FLandscapeComponentMaterialOverride and FLandscapeProxyMaterialOverride into FLandscapePerLODMaterialOverride since they were identical
* Fixed UpdateLayersMaterialInstances which, unlike UpdateMaterialInstances, didn't take into account per-component material overrides

From shelve 17931928 on behalf on Jonathan.Bard

#rb Jonathan.Bard
#jira UE-132031
#preflight 621cd5cd49723678579d9ec1

#ROBOMERGE-OWNER: luc.eygasier
#ROBOMERGE-AUTHOR: luc.eygasier
#ROBOMERGE-SOURCE: CL 19221589 via CL 19223810 via CL 19223838 via CL 19226205
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19230219 by luc eygasier in ue5-main branch]
2022-03-02 16:51:01 -05:00