Commit Graph

183 Commits

Author SHA1 Message Date
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
156f358e89 Pakfile pruning - disable by default the stripping of directory names; this was the default in 4.25 and was accidentally changed when changing pakfile indexes to strip directory names on load.
#rb Graeme.Thornton

#ushell-cherrypick of 13679152 by Matt.Peters

[CL 13720939 by Matt Peters in ue5-main branch]
2020-06-19 15:37:37 -04:00
Matt Kuhlenschmidt
603a4119c5 Fix HAL/PlatformFileManager.h non-portable casing CIS issues
#rb none

[CL 13214257 by Matt Kuhlenschmidt in ue5-main branch]
2020-05-06 17:58:18 -04:00
jeff newquist
5969077fc4 Added volatile keyword to WaitCompletionImpl to ensure compilers don't just optimize the check away.
#rb rune.stubbe
#jira none
#rnx

#ROBOMERGE-SOURCE: CL 13007135 in //UE4/Release-4.25/... via CL 13007150 via CL 13007159
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 13007166 by jeff newquist in Main branch]
2020-04-23 11:00:55 -04:00
jeff newquist
9fa4defb8c Fixed all size variants of IAsyncReadRequest so they correctly wait inside of WaitCompletionImpl for a callback to be completed before returning.
Normal read requests have this behavior, but size requests were not respecting this, which caused problems when the constructor launches a callback on another thread and then immediately calls WaitCompletion, such as in the callback lambda inside FFileCacheHandle::FFileCacheHandle / PushCompletedRequest.
#rb rune.stubbe
#jira none
#rnx

#ROBOMERGE-SOURCE: CL 12974187 in //UE4/Release-4.25/... via CL 12974195 via CL 12974203
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12974208 by jeff newquist in Main branch]
2020-04-22 09:27:31 -04:00
carlmagnus nordin
373fd671f7 Copying //UE4/Release-4.25Plus-Dev to Release-4.25Plus (//UE4/Release-4.25Plus)
#rnx
#jira none
#rb none

#ROBOMERGE-OWNER: carlmagnus.nordin
#ROBOMERGE-AUTHOR: carlmagnus.nordin
#ROBOMERGE-SOURCE: CL 12973630 in //UE4/Release-4.25Plus/... via CL 12973644
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12973696 by carlmagnus nordin in Main branch]
2020-04-22 06:25:12 -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
johan torp
53df220e4d Redo FArchiveProxy error propagation fix
#rb steve.robb


#ROBOMERGE-SOURCE: CL 12450992 via CL 12450999 via CL 12457993
#ROBOMERGE-BOT: (v672-12450963)

[CL 12458149 by johan torp in Release-Engine-Staging branch]
2020-03-26 16:42:07 -04:00
david hamm
565e716a08 Backout CL 12371098 per discussion, Johan to investigate
[FYI] johan.torp, steve.robb, eric.knapik
#rnx


#ROBOMERGE-SOURCE: CL 12434782 via CL 12434783 via CL 12437070
#ROBOMERGE-BOT: (v671-12333473)

[CL 12443982 by david hamm in Release-Engine-Staging branch]
2020-03-26 07:49:42 -04:00
johan torp
057f7ae5b7 FArchive error propagation to all proxies
#rb steve.robb, eric.knapik


#ROBOMERGE-SOURCE: CL 12371098 via CL 12372591 via CL 12388959
#ROBOMERGE-BOT: (v671-12333473)

[CL 12390565 by johan torp in Release-Engine-Staging branch]
2020-03-24 14:30:03 -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
thomas ross
d5ca9d72e2 No longer load verify data if verify code is turned off.
#rb none
#testing iOS Client


#ROBOMERGE-SOURCE: CL 11843182 via CL 11843195 via CL 11843203
#ROBOMERGE-BOT: (v656-11643781)

[CL 11879820 by thomas ross in Main branch]
2020-03-03 14:31:00 -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
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
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
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
PJ Kack
ef8a7b620e AUTO MERGE
Merging //UE4/Main @ 11112898 to //UE4/Dev-Core (dev-core-l0178)

#rb none

(ushell-p4-mergedown)

[CL 11113593 by PJ Kack in Dev-Core branch]
2020-01-26 11:35:42 -05:00
bob tellez
f1c85990a7 Merging CL#11107546
Partially back out changelist 11106714, only keeping intended merged code

[FYI] Dan.Phillips


#ROBOMERGE-SOURCE: CL 11107908 via CL 11107911
#ROBOMERGE-BOT: (v640-11091645)

[CL 11107914 by bob tellez in Main branch]
2020-01-24 14:39:10 -05:00
dan phillips
02a6949b4d Enable time based pak cache trimming
Allow a read request to tell the pak cache not to keep the memory after the request is completed.
Make virtual textures give up their pak cache memory immediately after loading.
[REVIEW] ben.woodhouse, steve.robb, david.harvey


#ROBOMERGE-OWNER: dan.phillips
#ROBOMERGE-AUTHOR: dan.phillips
#ROBOMERGE-SOURCE: CL 11106543 via CL 11106714 via CL 11106736 via CL 11106740
#ROBOMERGE-BOT: (v640-11091645)

[CL 11106744 by dan phillips in Main branch]
2020-01-24 13:03:34 -05:00
peter knepley
c641faa1e2 Fix crash when FChunkCacheWorker::CheckSignature and FPakPrecacher::DoSignatureCheck fail at the same time in different threads
#ROBOMERGE-SOURCE: CL 11066263 via CL 11066282 via CL 11066285
#ROBOMERGE-BOT: (v637-11041722)

[CL 11066290 by peter knepley in Main branch]
2020-01-20 14:04:52 -05:00
hongyi yu
91463c5fc8 Added public method GetPakchunkLocation(), PrioritizePakchunk() to all platform chunk install and move GetChunkLocation and PrioritizeChunk() to protected.
#rb Justin.Marcus


#ROBOMERGE-SOURCE: CL 11064634 via CL 11064641 via CL 11064653
#ROBOMERGE-BOT: (v637-11041722)

[CL 11064661 by hongyi yu in Main branch]
2020-01-20 11:48:36 -05:00
CarlMagnus Nordin
6abf1ca5c9 Create one IoDispatcher container file per pak file and let the pak file system handle mounting of IoStores
#rb per.larsson

[CL 11027862 by CarlMagnus Nordin in Dev-Core branch]
2020-01-16 06:01:45 -05:00
dan phillips
9087e02a6f Build break fix
#ROBOMERGE-SOURCE: CL 10993418 via CL 10993460 via CL 10993467
#ROBOMERGE-BOT: (v633-10983880)

[CL 10993471 by dan phillips in Main branch]
2020-01-15 11:04:40 -05:00