Commit Graph

245 Commits

Author SHA1 Message Date
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
Tim Smith
19dbfb1f07 Fixing PVS 7.7 Issues:
warning V1028: Possible overflow. Consider casting operands, not the result.

#rb trivial
#jira UE-91644

[CL 15068181 by Tim Smith in ue5-main branch]
2021-01-13 12:38:04 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -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
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -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
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -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
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
paul chipchase
227893a8f9 Fix a potential deadlock when loading from packfiles
This was originally fixed in CL 11458603 but it did not fix the issue entirely and in any case I was not happy with the manual reset event approach.
The problem with the manual reset event was that there is no actual safe point at which we can reset the event without risking some requesting thread missing it and waiting forever, it is just a lot rarer than the original thread lock.

- Each FChunkRequest now can be given an event that is triggered, so the correct thread is always woken up if waiting.
- Since the signals are 1-1 we no longer risk having threads never being woken.
- We only wake the thread that has a request to process so don't risk flooding the cpu.
- Removed FChunkCacheWorker::SetupDecryptionKey as it was not implemented/used.
- Removed FChunkCacheWorker::ChunkRequestAvailable and its associated methods ::WaitForNextChunk/::FlushRemainingChunkCompletionEvents.

In testing this version runs slightly faster on loading tests (0.2seconds on average), although just removing the events entirely and running a busy loop with a yield ran slightly faster on machines with less cores (4 cores with hyperthreading or less) albiet with a much higher variation and so potentially could end up a lot worse.

#rb Graeme.Thornton
#jira UE-89165


#ushell-cherrypick of 11724338 by paul.chipchase

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

[CL 11724764 by paul chipchase in Main branch]
2020-02-28 05:04:42 -05:00