Commit Graph

132 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
robert millar
18676387ad Don't discard decryptor if there are existing loaned-out pak readers.
#rb none

#ROBOMERGE-AUTHOR: robert.millar
#ROBOMERGE-SOURCE: CL 17683632 via CL 17683642 via CL 17683653 via CL 17683658 via CL 17685546
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v875-17642767)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 17685596 by robert millar in ue5-release-engine-test branch]
2021-09-30 20:06:51 -04:00
carlmagnus nordin
51c9794dea PackageStore refactor
* Decouple container concept from IoDispatcher
* Decoiuple PackageStore implementation from AsyncLoading2
* Restore ucas unmount fix that got kist when merrging from UE4
* Fix packages being left in the PackageStiore even after unmounting contaiiners

#rnx
#rb pj.kack, per.larsson
#preflight 61520cc52afc2d0001146ce7

#ROBOMERGE-AUTHOR: carlmagnus.nordin
#ROBOMERGE-SOURCE: CL 17641845 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v874-17637634)

[CL 17642353 by carlmagnus nordin in ue5-release-engine-test branch]
2021-09-28 04:00:33 -04:00
michael noland
8c4130b3db Some more type truncation fixes in various headers that typical game modules might include
#jira UE-116218
[CODEREVIEW] ben.hoffman

#ROBOMERGE-AUTHOR: michael.noland
#ROBOMERGE-SOURCE: CL 17578885 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v871-17566257)

[CL 17578907 by michael noland in ue5-release-engine-test branch]
2021-09-20 23:00:43 -04:00
robert millar
099e0a7dab Fix crash in pak decryptor by giving the decryptor its own archive.
#jira none
#rb none

#ROBOMERGE-AUTHOR: robert.millar
#ROBOMERGE-SOURCE: CL 17454440 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)
#ROBOMERGE[bot1]: dev-enginemerge

[CL 17454441 by robert millar in ue5-release-engine-test branch]
2021-09-08 02:06:15 -04:00
robert millar
0271ac152f More UnrealPak compile fixes.
#jira none
#rb none

#ROBOMERGE-AUTHOR: robert.millar
#ROBOMERGE-SOURCE: CL 17448461 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)
#ROBOMERGE[bot1]: Dev-EngineMerge

[CL 17448548 by robert millar in ue5-release-engine-test branch]
2021-09-07 15:19:04 -04:00
robert millar
6ba7dbe7fa Fix editor and clang compiles for pak file changes.
#jira none
#rb none

#ROBOMERGE-AUTHOR: robert.millar
#ROBOMERGE-SOURCE: CL 17447958 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)
#ROBOMERGE[bot1]: Dev-EngineMerge

[CL 17447973 by robert millar in ue5-release-engine-test branch]
2021-09-07 14:35:08 -04:00
robert millar
63bef39a53 Share pak readers between threads and retire pak readers that haven't been used after a few seconds.
#jira UE-120694
#rb carlmagnus.nordin, ben.woodhouse

#ROBOMERGE-AUTHOR: robert.millar
#ROBOMERGE-SOURCE: CL 17447692 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)
#ROBOMERGE[bot1]: Dev-EngineMerge

[CL 17447706 by robert millar in ue5-release-engine-test branch]
2021-09-07 14:10:23 -04:00
Dan Phillips
b1f07b35c4 Back out changelist 16406639
[CL 16410511 by Dan Phillips in ue5-release-engine-staging branch]
2021-05-20 17:22:17 -04:00
dan phillips
0ee56400a1 Bug fix for pak files, pending requests counter needs to be decremented when the request is complete not when the user deletes the request handle.
Expose the requests counter for requests that are fullfilable based on priority
Add in a way to suspend the IOStore if the pak cache is busy, this can help IO perf (disabled by default)

#rb robert.millar


#ROBOMERGE-SOURCE: CL 16401267 via CL 16401284 via CL 16401290 via CL 16401295 via CL 16401298
#ROBOMERGE-BOT: (v804-16311228)

[CL 16406639 by dan phillips in ue5-release-engine-staging branch]
2021-05-20 14:06:53 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
CarlMagnus Nordin
c565398bdd IoDispatcher: Added support for external backends
#rnx
#rb pj.kack, per.larsson

[CL 15134585 by CarlMagnus Nordin in ue5-main branch]
2021-01-19 04:39:56 -04:00
Marc Audy
ada7c144fa Merge //UE5/Release-Engine-Staging @14903491 to //UE5/Main
[CL 14906022 by Marc Audy in ue5-main branch]
2020-12-11 14:21:20 -04:00
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