Commit Graph

118 Commits

Author SHA1 Message Date
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00
Matt Peters
6edac61917 Fix a crash when decryption of a pak signature fails
#ROBOMERGE-SOURCE: CL 14629445 via CL 14629451 via CL 14629453 via CL 14629688 via CL 14629956 via CL 14630024
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v753-14616146)

#ushell-cherrypick of 14632086 by graeme.thornton

[CL 14784442 by Matt Peters in ue5-main branch]
2020-11-18 21:13:18 -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
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
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
matt peters
51f2ddfc2f #rb Graeme.Thornton
[RN] Minor, PakFiles

#ROBOMERGE-SOURCE: CL 12502978 via CL 12502983 via CL 12502984
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12502987 by matt peters in Main branch]
2020-03-31 19:02:11 -04:00
Matt Peters
4783327951 #jira UE-90069
Legacy pak file versions encode pak entries in FPakFile::LoadLegacyIndex. That function repeatedly serializes bytes from the pakfile on disk into a reused FPakEntry. Serialize expects the FPakEntry to be in an empty constructed state, and it was not empty due to serializing previous PakEntries into it.
Added a reset function and call it in this one place where FPakEntry is reused.
#rb Graeme.Thornton
#rnx

[CL 12000363 by Matt Peters in Main branch]
2020-03-06 10:39:13 -05:00
matt peters
f9fc7dd5e4 #jira UE-88959 Fix includes-after-first-code-block static analysis warning.
#rb trivial
#rnx


#ROBOMERGE-SOURCE: CL 11498882 via CL 11499002
#ROBOMERGE-BOT: (v654-11333218)

[CL 11499043 by matt peters in Main branch]
2020-02-18 10:07:44 -05:00
matt peters
913830a60a #jira UE-88844
Fix incorrect use of static constexpr without inline.
#rb trivial
#rnx


#ROBOMERGE-SOURCE: CL 11465526 via CL 11465539
#ROBOMERGE-BOT: (v654-11333218)

[CL 11465545 by matt peters in Main branch]
2020-02-17 16:08:12 -05:00
Matt Peters
9462da8501 Revert the invalidation of revision PakFile_Version_FrozenIndex; that change was incorrectly merged to main.
#rb trivial
#rnx

[CL 11458172 by Matt Peters in Main branch]
2020-02-16 19:01:38 -05:00
matt peters
79a6482923 Fix localization not detecting the existance of some localization files and falling back to english for those files. FPakFile::NormalizeDirectoryQuery was incorrectly returning false when queried for whether the MountPoint exists.
#ROBOMERGE-SOURCE: CL 11458135 via CL 11458136 via CL 11458137 via CL 11458138
#ROBOMERGE-BOT: (v654-11333218)

[CL 11458139 by matt peters in Main branch]
2020-02-16 18:36:33 -05:00
matt peters
6572e7beb4 [REVIEW-11458122]
OptimizedPakIndex: Bump the PakIndex version from 9 to 10, to avoid conflict with PakFile_Version_FrozenIndex = 9 from mainline.  This change will remain in Fortnite only, and unlike UE::Main will refuse to load version 9 paks.  This change can be clobbered with UE::Main's version after a few days when we have deleted all of our version 9 paks.


#ROBOMERGE-SOURCE: CL 11458117 via CL 11458118 via CL 11458119 via CL 11458120
#ROBOMERGE-BOT: (v654-11333218)

[CL 11458121 by matt peters in Main branch]
2020-02-16 18:30:09 -05:00
Matt Peters
40f55732ba #jira FORT-236167
[REVIEW]
#rb Graeme.Thornton
Optimize Pak file indices by computing the PathHashIndex in unrealpak rather than using strings at runtime.
This also removes the need to shrink the string indices for performance, which was triggering a bug due to unsynchronized multithreaded access.

#ROBOMERGE-SOURCE: CL 11442058 in //Fortnite/Release-12.00/... via CL 11442063 via CL 11442073 via CL 11442081

[CL 11443295 by Matt Peters in Main branch]
2020-02-14 09:53:05 -05:00
graeme thornton
a224a3f8dd Fix for signature checking related issues
#rb steve.robb


#ROBOMERGE-SOURCE: CL 11303014 via CL 11303031 via CL 11303037 via CL 11303042
#ROBOMERGE-BOT: (v0-11244347)

[CL 11303201 by graeme thornton in Main branch]
2020-02-10 08:11:47 -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
hongyi yu
a3c2c214a3 Fixing namings of pakchunk index and chunk id.
Name the number in pakchunk file pakchunk index and the number of a platform chunk chunk id to avoid confusion.  Also keep this naming convention consistent across all platform code.



#ROBOMERGE-SOURCE: CL 11131543 via CL 11132441 via CL 11132504
#ROBOMERGE-BOT: (v640-11091645)

[CL 11132564 by hongyi yu in Main branch]
2020-01-28 13:04:23 -05:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
Stefan Boberg
1f813eb516 Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb many

[CL 9405827 by Stefan Boberg in Main branch]
2019-10-03 16:26:48 -04:00
steve robb
14cab21e0c Deprecating ARRAY_COUNT and changing it to UE_ARRAY_COUNT.
Replicated from CL# 7924370.

#rb none


#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 9279060 via CL 9279063
#ROBOMERGE-BOT: (v443-9013191)

[CL 9279836 by steve robb in Main branch]
2019-09-28 08:19:35 -04:00
ben woodhouse
10b655d3f0 Add a delegate which fires when the startup loading screen is shown
Also add support for overriding the startup pak mount wildcard
#rb daniel.lamb,dan.phillips


#ROBOMERGE-OWNER: ben.woodhouse
#ROBOMERGE-AUTHOR: ben.woodhouse
#ROBOMERGE-SOURCE: CL 8511857 via CL 8511859 via CL 8511866 via CL 8512599 via CL 8513780
#ROBOMERGE-BOT: (v406-8472469)

[CL 8513797 by ben woodhouse in Main branch]
2019-09-05 20:16:57 -04:00
daniel lamb
20429a57b7 Fixed alignment of non compressed files in pak files.
Also removed DDC config file.  Will need to figure out another way to do this when we enable DDC.
Graeme.Thornton


#ROBOMERGE-SOURCE: CL 8240468 via CL 8240483 via CL 8243394
#ROBOMERGE-BOT: (v401-8057353)

[CL 8243494 by daniel lamb in Main branch]
2019-08-23 19:57:51 -04:00
dan phillips
a803f35fce Allow a pak file to be made using the subset of another pak file.
Allow more control over the pak cache, cache per pak, indvidual caches for all paks.
Increase the number of cached blocks for XboxOne.
Enable cache per pak for XboxOne.

[FYI] ben.woodhouse
gil.gribb, graeme.thornton


#ROBOMERGE-OWNER: dan.phillips
#ROBOMERGE-AUTHOR: dan.phillips
#ROBOMERGE-SOURCE: CL 7681509 via CL 7689295
#ROBOMERGE-BOT: (v383-7686620)

[CL 7689301 by dan phillips in Main branch]
2019-08-01 13:07:35 -04:00
graeme thornton
51cfbaef7d UnrealPak - Added "TestMemoryOptimization" mode which attempts to unload filenames and shrink pak entries across every pak in a directory, making sure there are no collisons and that everything works correctly
#ROBOMERGE-SOURCE: CL 7227149 via CL 7227151 via CL 7227434
#ROBOMERGE-BOT: (v367-6836689)

[CL 7227472 by graeme thornton in Main branch]
2019-07-08 10:23:53 -04:00
graeme thornton
1ac0af212f Improvements to pak index memory optimizations
- Fix entry shrinking not working on pak files that contain files that are encrypted AND compressed
 - Optimize any pak files that are added after encryption keys are registered
 - Improvements to logging / diagnostics
 - Use a unique starting seed (hash of filename) when doing filename unloading. Reduces cost expected collisions (localization paks / encrypted paks with duplicated assets)
 - In non-shipping builds, decode shrunken entries after the shrinking to check they match the original
 - Fix leaked FPakFile object when it was immediately determined to be invalid

#rb allan.bentham
[FYI] ben.woodhouse, hongyi.yu


#ROBOMERGE-OWNER: graeme.thornton
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 7139776 via CL 7139778 via CL 7167780
#ROBOMERGE-BOT: (v367-6836689)

[CL 7167782 by graeme thornton in Main branch]
2019-06-22 04:31:15 -04:00