Commit Graph

636 Commits

Author SHA1 Message Date
paul chipchase
1773b3a77d Fix a typo in a newly added API method (IsInSeperateFile -> IsInSeparateFile) before the 4.25 release to avoid future issues.
#jira none
#rb devin.doucette, stefan.boberg
#lockdown stefan.boberg


#ushell-cherrypick of 12918250 by paul.chipchase

#ROBOMERGE-SOURCE: CL 12919209 in //UE4/Release-4.25Plus/... via CL 12919222
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12919263 by paul chipchase in Main branch]
2020-04-20 07:36:36 -04:00
CarlMagnus Nordin
0f3ddfc883 Compile fix
#rnx
#rb none

[CL 12651612 by CarlMagnus Nordin in Main branch]
2020-04-07 05:17:52 -04:00
CarlMagnus Nordin
4461ecf3ed AsyncLoading2: Gracefully handle missing chunks and imports
#rb per.larsson
#jira UE-91368
#rnx

[CL 12651590 by CarlMagnus Nordin in Main branch]
2020-04-07 05:10:41 -04:00
carlmagnus nordin
25e8b4dd7d Copying //UE4/Release-4.25Plus-Dev to Release-4.25Plus (//UE4/Release-4.25Plus)
#rnx
#robomerge[BOT1] Main-For-EngineMerge
#rb none
#jira none
#lockdown stefan.boberg

#ROBOMERGE-OWNER: carlmagnus.nordin
#ROBOMERGE-AUTHOR: carlmagnus.nordin
#ROBOMERGE-SOURCE: CL 12504704 in //UE4/Release-4.25Plus/... via CL 12504720
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12504759 by carlmagnus nordin in Main branch]
2020-04-01 05:00:26 -04:00
uriel doyon
93a4d890b3 Improved support for static mesh streaming. CPU LOD data is now streamed out when LODs are streamed out.
FStaticMeshLODResources are now ref counted to prevent deleting the data while it is being accessed.
The stream out strategy now involves waiting several frame before streaming out, if there are external references to the LOD.
This number of checks is controlled by the new "r.Streaming.MaxReferenceChecksBeforeStreamOut" with a default value of 3.
Disabled StaticMesh streaming while in the editor to prevent issues with tools.

UNiagaraDataInterfaceStaticMesh now correctly support preview feature level and in game LOD streaming.
LODData that is cached initialization time is now invalidated if that LOD is streamed out, this
only affect GPU sampling and FStaticMeshFilteredAreaWeightedSectionSampler).

#rb jian.ru

#ROBOMERGE-SOURCE: CL 12469631 via CL 12469638 via CL 12469648
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v672-12450963)

[CL 12469663 by uriel doyon in Main branch]
2020-03-27 11:47:00 -04:00
josh adams
b83a3f627f - Fixed a non-unity issue
#rnx
#rb trivial


#ROBOMERGE-SOURCE: CL 12164770
#ROBOMERGE-BOT: (v661-12148976)

[CL 12164772 by josh adams in Main branch]
2020-03-13 13:36:18 -04:00
johan torp
256d7525ee Improved UnversionedPropertySerializationTest
Collect detailed information on roundtripping error to pinpoint problems much faster.

Implement Identical() for some movie scene evaluation types to fix UnversionedPropertySerializationTest

Previous Identical() implementation returned false since they were only compared to default value and was known to always differ from default. UPS test requires proper Identical() implementation.

#[fyi] andrew.rodham, austin.crismore
#jira none
#rb none
#ushell-cherrypick of 11443195 by Johan.Torp
#ushell-cherrypick of 11458738 by Johan.Torp

#ROBOMERGE-SOURCE: CL 12147958 in //UE4/Release-4.25/... via CL 12147961
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12147967 by johan torp in Main branch]
2020-03-12 08:07:50 -04:00
Eric Knapik
0b1dd07075 #Jira: none
Sets ArIsError and ArIsCriticalError to private

[at]Graeme.Thornton [at]Johan.Torp [at]Steve.Robb [at]Carlos.Cuello

#rb Steve.Robb
#ROBOMERGE-OWNER: Eric.Knapik
#ROBOMERGE-AUTHOR: eric.knapik
#ROBOMERGE-SOURCE: CL 11949030 via CL 11949058 via CL 11949116 via CL 11949174
#ROBOMERGE-BOT: (v656-11643781)

[CL 11953024 by Eric Knapik in Main branch]
2020-03-05 14:43:10 -05:00
paul chipchase
da64ddeb6b Fix IoStore CIS tests.
There was a mismerge of the fix 11091798 when it was moved from dev-core to a private branch which reintroduced the exception for FBulkDataBase::CanLoadFromDisk, so that it would pass inlined data if it was running from IoStore. This would then quite rightly trigger issues in our automated tests.

Restored the original fix in 11091798.

#rnx
#rb none
#jira UE-90089, UE-90096

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

[CL 11934362 by paul chipchase in Main branch]
2020-03-05 07:48:48 -05:00
andrew ladenberger
e3d77e3407 Reduced namedevent overhead from STAT_FAsyncLoadingThread_ProcessAsyncLoading
#rb robert.manuszewski
[FYI] jordan.cristiano


#ROBOMERGE-SOURCE: CL 11550023 via CL 11550046 via CL 11550057
#ROBOMERGE-BOT: (v654-11333218)

[CL 11551981 by andrew ladenberger in Main branch]
2020-02-19 15:50:26 -05:00
arciel rekman
2ce92e463c Fix async loading weirdness causing crashes (FORT-247120).
- RobManuszewski's change, reverting CLs 7799323 and 8224969
#rb Robert.Manuszewski (authored)


#ROBOMERGE-SOURCE: CL 11458363 via CL 11458497 via CL 11458505 via CL 11458513
#ROBOMERGE-BOT: (v654-11333218)

[CL 11458525 by arciel rekman in Main branch]
2020-02-17 01:29:00 -05:00
carlmagnus nordin
0f242a77c2 Guard against recursive calls to FTaskGraphInterface::ProcessThreadUntilIdle during async loading
#rb per.larsson
#ushell-cherrypick of 11327342 by CarlMagnus.Nordin


#ROBOMERGE-SOURCE: CL 11373304 via CL 11373313 via CL 11373318
#ROBOMERGE-BOT: (v654-11333218)

[CL 11373323 by carlmagnus nordin in Main branch]
2020-02-12 02:28:06 -05:00
Josh Adams
aa9705149b Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing.
#rb none

[CL 11282608 by Josh Adams in Main branch]
2020-02-06 13:13:41 -05:00
Stefan Boberg
55a8b15f1f Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb none

[CL 11258477 by Stefan Boberg in Main branch]
2020-02-05 14:26:36 -05:00
steve robb
e02157586c New NDC line which reports the name of the class of the asset containing the differences.
#rb none
[FYI] ken.hawthorne


#ROBOMERGE-SOURCE: CL 11254859 via CL 11255081 via CL 11255096
#ROBOMERGE-BOT: (v647-11244347)

[CL 11255345 by steve robb in Main branch]
2020-02-05 13:05:51 -05:00
Chris Gagnon
c3f9a18841 Merge from Main in prep for Dev-Tools-Staging Copy up
#rb none

[CL 11221539 by Chris Gagnon in Dev-Tools-Staging branch]
2020-02-04 17:00:31 -05:00
steve robb
189b404b04 Scoped approach to incrementing log counts.
#rb none
#rnx


#ROBOMERGE-SOURCE: CL 11199785 via CL 11199794
#ROBOMERGE-BOT: (v640-11091645)

[CL 11199803 by steve robb in Main branch]
2020-01-31 15:38:43 -05:00
steve robb
2c23c83eeb LastDifferenceCallstackDataText updated on scope exit, no matter how that happens.
#rb none
#rnx


#ROBOMERGE-SOURCE: CL 11199712 via CL 11199717
#ROBOMERGE-BOT: (v640-11091645)

[CL 11199718 by steve robb in Main branch]
2020-01-31 15:33:55 -05:00
steve robb
489340a688 More flattening.
#rb none
#rnx


#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 11199407 via CL 11199413
#ROBOMERGE-BOT: (v640-11091645)

[CL 11199461 by steve robb in Main branch]
2020-01-31 15:14:27 -05:00
steve robb
0f11ead857 More flattening of logic.
#rb none
#rnx


#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 11198904 via CL 11198913
#ROBOMERGE-BOT: (v640-11091645)

[CL 11199047 by steve robb in Main branch]
2020-01-31 14:49:22 -05:00
steve robb
339d87f774 Use of ON_SCOPE_EXIT to clarify intended code flow.
#rb none
#rnx


#ROBOMERGE-SOURCE: CL 11198641 via CL 11198672
#ROBOMERGE-BOT: (v640-11091645)

[CL 11198687 by steve robb in Main branch]
2020-01-31 14:23:30 -05:00
steve robb
5fd8b59ec8 Simple refactoring to reduce indentation.
#rb none
#rnx


#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 11197939 via CL 11197966
#ROBOMERGE-BOT: (v640-11091645)

[CL 11198535 by steve robb in Main branch]
2020-01-31 14:19:27 -05:00
steve robb
0f03ba4bc4 Simplification of DiffMap checking code.
#rb trivial
#rnx


#ROBOMERGE-SOURCE: CL 11197857 via CL 11197864
#ROBOMERGE-BOT: (v640-11091645)

[CL 11198225 by steve robb in Main branch]
2020-01-31 14:02:50 -05:00
paul chipchase
c68d8f8c43 Add support for memory mapped files to BulKData2 which will fix a crash when memory mapped animations have been enabled.
- Attempting to memory map inline data will give a log error(as the original implementation did but will not attempt to actually memory map it as it is very unlikely that inline data would have the correct alignment requirements for the operation to succeed so to keep the code simple we just serialize the inline data which was the existing fallback behaviour anyway.
- Added the memory mapping implementation as it's own method (MemoryMapBulkData) since we only need to support the non-inline case.
- Added a flag (bShouldForceLoad) that when true will force the BulkData2 data to be streamed in immediately. Currently used as a fallback if the memory mapping fails (all callers assume 100% success) but I made it generic enough that we could use it for something else if the use case occurs.
- This is a fairly quick fix to unblock testing, future work includes:
  - Reduce the added memory bloat (adding 2 additional pointers to BulkData2)
  - Implement copy/assignment of memory mapped BulkData (based on the above work)

#jira UE-85974
#rnx
#rb Per.Larsson

[CL 11194361 by paul chipchase in Main branch]
2020-01-31 06:51:54 -05:00
peter knepley
f96ce0349c Back out revision 3 from ArchiveStackTrace.cpp. SerializedProp isn't even saved in the cases where gameplay tag container differs so there's nothing to output.
#jira
[FYI] Steve.Robb


#ROBOMERGE-SOURCE: CL 11128612 via CL 11128617 via CL 11128620
#ROBOMERGE-BOT: (v640-11091645)

[CL 11128623 by peter knepley in Main branch]
2020-01-28 09:04:05 -05:00