Commit Graph

95 Commits

Author SHA1 Message Date
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
charles bloom
c557b39425 improvements to Pak file for modern compressors
#rb: josh.adams

[CL 15242895 by charles bloom in ue5-main branch]
2021-01-28 13:15:37 -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
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
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
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -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 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
brooke hubert
d3c732505a Feature and content Paks can be imported again in the editor.
# This was a side effect of removal of hash storage in index entries from CL 11442058

#rnx
#rb matt.peters

#ROBOMERGE-SOURCE: CL 12900833 via CL 12900834 via CL 12900835
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12907408 by brooke hubert in Main branch]
2020-04-18 16:00:56 -04:00
josh adams
6142689460 - Added compression methods to the pak dump outpout
#rb trivial

#ROBOMERGE-SOURCE: CL 12873061 via CL 12873196 via CL 12873273
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12873301 by josh adams in Main branch]
2020-04-16 17:12:56 -04:00
daniel lamb
53e963cf99 Fixed compile error in my last checkin.
#ROBOMERGE-SOURCE: CL 12758498 via CL 12759098 via CL 12759136 via CL 12759170
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)

[CL 12759193 by daniel lamb in Main branch]
2020-04-13 13:37:30 -04:00
daniel lamb
9c6f24761e Extracting pak files now supports multiple encryption keys
Graeme.Thornton

#ROBOMERGE-SOURCE: CL 12757780 via CL 12758878 via CL 12758909 via CL 12759078
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)

[CL 12759155 by daniel lamb in Main branch]
2020-04-13 13:36:39 -04:00
josh adams
7141cbac93 - Added -Info option for UnrealPak to dump some header info about a pak file
#rb trivial
[FYI] daniel.lamb


#ROBOMERGE-SOURCE: CL 12336069 via CL 12336079
#ROBOMERGE-BOT: (v671-12333473)

[CL 12336086 by josh adams in Main branch]
2020-03-20 10:52:57 -04:00
Arciel Rekman
e970ef5ea2 ShaderLibrary sorted by file open order, with other fixes (FORT-265600).
- Each shadermap is now associated with one or more assets, and shaders are laid out according to the
  open order of those assets, if provided. If not provided, the original ordering is kept. The original ordering
  will not be always deterministic, particularly if shader compilation needs to happen, because jobs can get
  reordered during the compilation.

Other fixes:

- Fixed sorting within the shadermap not being deterministic (FCompareShaderPrimaryKey)
- Fixed Niagara shadermap duplicating Platform property and not initializing it properly.
- Removed (unused) support for Child shader libraries (would not be deterministic).

#rb Ben.Ingram, Rob.Krajcarski


#ROBOMERGE-OWNER: Arciel.Rekman
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 12249260 via CL 12249262 via CL 12250173
#ROBOMERGE-BOT: (v668-12245121)

[CL 12250313 by Arciel Rekman in Main branch]
2020-03-18 15:35:20 -04:00
Matt Peters
34c1a8d018 Fix bad merge - restore diffs from revision 50. 51 (Pak file freezing) was intentionally reverted, but 50 (pak file system handle mounting of IoStores) was a mistake and should have been kept.
#rb trivial
#rnx

[CL 12123942 by Matt Peters in Main branch]
2020-03-11 08:32:05 -04: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
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
Devin Doucette
070f44a07a Add debug context to DDC requests that take the key as a parameter
The existing GetSynchronous, GetAsynchronous, and Put functions are deprecated in favor of the DebugContext overloads. It is unlikely that a licensee has derived from FDerivedDataCacheInterface, but anyone who does will have a compile error that they override a non-virtual function and that they don't implement a pure virtual function, which will be straightforward to fix.

#rb Zousar.Shaker

#ROBOMERGE-OWNER: Devin.Doucette
#ROBOMERGE-AUTHOR: devin.doucette
#ROBOMERGE-SOURCE: CL 11210386 via CL 11210387
#ROBOMERGE-BOT: (v643-11205221)

[CL 11210609 by Devin Doucette in Main branch]
2020-02-03 17:17:56 -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
graeme thornton
b445f78774 unrealpak: Fix a typo where I accidentally removed the last digit of a constant
#rnx


#ROBOMERGE-SOURCE: CL 11078276 via CL 11078288 via CL 11078295
#ROBOMERGE-BOT: (v637-11041722)

[CL 11078297 by graeme thornton in Main branch]
2020-01-21 18:09:35 -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
ryan durand
471d972e62 Updating copyright for Engine Developer.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870584 by ryan durand in Main branch]
2019-12-26 15:32:37 -05:00