Commit Graph

33 Commits

Author SHA1 Message Date
Devin Doucette
ce646af39a StorageServerClient: Drive-by cleanup of includes
#preflight 62cf271cea2e46072f13db6a
#rb Zousar.Shaker
#rnx

[CL 21080562 by Devin Doucette in ue5-main branch]
2022-07-13 16:47:43 -04:00
Per Larsson
279fb731e9 Zen: Fixed error converting non null terminated error string from ANSI to TCHAR
#rb Martin.Ridgers
#preflight 62c432da5751c96193c966cd
#rnx

[CL 20941128 by Per Larsson in ue5-main branch]
2022-07-05 09:30:59 -04:00
Ben Marsh
b1dff0067a Fix static analysis warning (declaring virtual methods in final class is pointless)
#preflight none
#fyi CarlMagnus.Nordin

[CL 20486300 by Ben Marsh in ue5-main branch]
2022-06-03 10:46:48 -04:00
CarlMagnus Nordin
3d5a2052dc AsyncLoading2: Add support for having multiple PackageStore backends
#preflight 6296fc872a1851b4ccae7e39
#rb pj.kack

[CL 20447121 by CarlMagnus Nordin in ue5-main branch]
2022-06-01 02:12:33 -04:00
devin doucette
b2a07ea03e DDC: Merge from UE5/Main
#preflight 6288ff678828ea88c8af7034
#preflight 628ab5d93246d5019db76ed2
#rb none
#rnx

#ROBOMERGE-OWNER: devin.doucette
#ROBOMERGE-AUTHOR: Devin.Doucette
#ROBOMERGE-SOURCE: CL 20353148 via CL 20353832 via CL 20353839
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v948-20297126)

[CL 20355348 by devin doucette in ue5-main branch]
2022-05-24 16:40:25 -04:00
CarlMagnus Nordin
0282a5aef6 Unified Zen and legacy COTF network protocols.
*Reduces code duplication
*Enables the same ODSC flow to be used for both COTF variants
*The client will now autodetect if it should run in Zen mode or not
#rb pj.kack,per.larsson
#preflight 628c79bdf057b981ca479b3e

[CL 20344832 by CarlMagnus Nordin in ue5-main branch]
2022-05-24 02:50:39 -04:00
CarlMagnus Nordin
210d67b30e Promoted Zen project id generation to FApp
#rb pj.kack
#preflight 628769032c34da686ac82442

[CL 20316798 by CarlMagnus Nordin in ue5-main branch]
2022-05-23 01:49:25 -04:00
Devin Doucette
92a888c1f6 Replaced uses of _ASV with ANSITEXTVIEW
#preflight 6266acf50634d0904cdfe91c
#rb Steve.Robb
#rnx

[CL 19903251 by Devin Doucette in ue5-main branch]
2022-04-25 11:31:36 -04:00
CarlMagnus Nordin
63b8cbc9dd AsyncLoading2: Implemented loading of optional package segments
#rnx
#preflight 62627548ac29fcf6a213fe33
#rb francis.hurteau

[CL 19900368 by CarlMagnus Nordin in ue5-main branch]
2022-04-25 07:37:07 -04:00
PJ Kack
e9d2d7c1aa ZenCOTF: Fix ODSC related shutdown crashes and deadlocks caused by issueing shader compilation requests after cotf server connection has been closed by StorageServerPlatformFile.
#jira none
#rb carlmagnus.nordin, jason.nadro
#rnx
#preflight 624c49a4cc0872e96b05f10e

[CL 19643400 by PJ Kack in ue5-main branch]
2022-04-06 02:31:41 -04:00
CarlMagnus Nordin
c8943034df ZenCOTF: Fixed shutdown crash caused by server connection outliving the socket system
#rnx
#preflight 621e212fad75a7f58fbf6b33
#rb pj.kack

[CL 19219059 by CarlMagnus Nordin in ue5-main branch]
2022-03-02 02:53:54 -05:00
CarlMagnus Nordin
d625e9346c ZenCOTF: Refactored request manager to allow packages being recooked
#rnx
#preflight 620220b797149bc07a9935c2
#rb none

[CL 18899971 by CarlMagnus Nordin in ue5-main branch]
2022-02-08 03:05:43 -05:00
CarlMagnus Nordin
982d0dc2c3 ZenCOTF: Fixed reversed order between connecting to the cotf server and zen
#rnx
#preflight 61fd4f3d295dd9c101c1a610
#rb pj.kack

[CL 18883399 by CarlMagnus Nordin in ue5-main branch]
2022-02-07 02:47:27 -05:00
CarlMagnus Nordin
9b83a6ffea Moved FCookOnTheFlyPackageStore declaration to header file
#rnx
#rb trivial
#preflight 61fd4a1b51378325c33f4c3d

[CL 18864090 by CarlMagnus Nordin in ue5-main branch]
2022-02-04 11:03:31 -05:00
Martin Ridgers
80a63f44c6 Check local cooked for files that are to be read externally
Currently there are some instances where data must exist on the local file system in order for it to be read by a third party API (Mac's Metal shader libraries being one such example). This change overlays files in Saved/Cooked and checks in there for any external-read path requested that is and prefixed with ../../../
#rb perl
#rnx
#preflight 61fbc8f23b22793ca35698a2

[CL 18841660 by Martin Ridgers in ue5-main branch]
2022-02-03 07:25:17 -05:00
carlmagnus nordin
b49e6d13e2 Made Zen COTF API more private
#rnx
#rb pj.kack
#preflight 61f3c7e0da54035207f6c79f

#ROBOMERGE-AUTHOR: carlmagnus.nordin
#ROBOMERGE-SOURCE: CL 18770247 in //UE5/Release-5.0/... via CL 18770252 via CL 18770332
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18770334 by carlmagnus nordin in ue5-main branch]
2022-01-28 08:30:42 -05:00
per larsson
d4d3f66241 Zen - fix bug with missing offset argument
#rb CarlMagnus.Nordin
#rnx
#jira none
#preflight none

#ROBOMERGE-AUTHOR: per.larsson
#ROBOMERGE-SOURCE: CL 18615694 in //UE5/Release-5.0/... via CL 18615702 via CL 18615712
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v899-18417669)

[CL 18615718 by per larsson in ue5-main branch]
2022-01-14 05:00:42 -05:00
mark lintott
8d46a9f8ed Non-Unity fixes
#jira none
[FYI] zousar.shaker
#rb trivial
#preflight 61b726f1c65177a6745e587a

#ROBOMERGE-AUTHOR: mark.lintott
#ROBOMERGE-SOURCE: CL 18442365 in //UE5/Release-5.0/... via CL 18445000
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v897-18405271)

[CL 18445180 by mark lintott in ue5-release-engine-test branch]
2021-12-13 13:30:38 -05:00
zousar shaker
0832797d28 Ensure that Zen ProjectIds are unique for projects with the same name in differing roots (or in the same root) while attempting to maintain some easily recognizable desriptors for the project.
Staged builds are explicitly assigned a project id via the persistent UECommandline.txt file.  This works on mobile/consoles, but isn't implemented for Windows/Linux/Mac, so staged builds for those platforms don't have a persistent assignment of project id and instead rely on the launch by the editor including the appropriate commandlines.
Unstaged builds on Windows/Mac/Linux now determine project id independently after they have determined the project file path.  This happens after the project file has been determined and has had case corrected.  This ensures it is different/unique for multiple blueprint projects that share the same executable.
Fix a bug where second cook in editor to zen would stall because the queue thinks all additions are finished due to a boolean that isn't reset.

#rb devin.doucette
#rb per.larsson
#preflight 61b39a35a2562c8b1c40f81e

#ROBOMERGE-AUTHOR: zousar.shaker
#ROBOMERGE-SOURCE: CL 18432317 in //UE5/Release-5.0/... via CL 18435404
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v897-18405271)

[CL 18435895 by zousar shaker in ue5-release-engine-test branch]
2021-12-10 18:06:39 -05:00
devin doucette
27c1393427 CompressedBuffer: Removed partial decompression from FCompressedBuffer now that FCompressedBufferReader is available
Requiring the use of a separate reader type makes it more likely that readers will be reused, and makes it easier to audit reader usage going forward. Reusing readers is desirable to reduce the number of large temporary allocations made during partial decompression of a buffer.

- Added FCompressedBuffer::Save(FArchive&) and renamed FromCompressed(FArchive&) to Load(FArchive&).
- Added FCompressedBufferReaderSourceScope to set a buffer source within a scope.
- Added proper bounds checks to FNoneDecoder.
- Store the header checksum on the decoder context to allow raw blocks to be reused across sources.
- Decode the header on the fly to avoid a temporary header allocation when the header is in contiguous memory.

#rb Zousar.Shaker
#rnx
#preflight 61a98d53800738dbfbc84c73

#ROBOMERGE-AUTHOR: devin.doucette
#ROBOMERGE-SOURCE: CL 18382211 in //UE5/Release-5.0/... via CL 18382310
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v896-18170469)

[CL 18382377 by devin doucette in ue5-release-engine-test branch]
2021-12-06 10:16:05 -05:00
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
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
brian white
cebe325639 [StorageServer] Change fatal error to log when connecting to potential storage server addresses. This allows connection attempts to continue, iterating through the specified list of host addresses
#jira UE-127311
#rb CarlMagnus.Nordin Per.Larsson
#preflight 61571465998a2100011bdb8b

#ROBOMERGE-AUTHOR: brian.white
#ROBOMERGE-SOURCE: CL 17692405 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v875-17642767)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 17692419 by brian white in ue5-release-engine-test branch]
2021-10-01 11:35:46 -04:00
carlmagnus nordin
1a96030cec Added missing include
#rnx

#ROBOMERGE-AUTHOR: carlmagnus.nordin
#ROBOMERGE-SOURCE: CL 17643126 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v875-17642767)

[CL 17643129 by carlmagnus nordin in ue5-release-engine-test branch]
2021-09-28 05:00:12 -04:00