Commit Graph

15 Commits

Author SHA1 Message Date
michael trepka
03a04c681c Modified error handling code in ShaderCodeLibrary to display a message box telling players the game files are missing instead of crashing with fatal UE_LOG message.
#rb Chris.Bunner

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 6446280 via CL 6446292 via CL 6447699 via CL 6447733
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6508278 by michael trepka in Dev-VR branch]
2019-05-15 15:37:22 -04:00
ben woodhouse
32ae5f4793 Add cvar to set IO priority for shader code library reads: r.ShaderCodeLibrary.DefaultAsyncIOPriority. Sometimes they are thrashing during uobject reads and causing seeks.
Setting is unchanged for now
[FYI] gil.gribb

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.woodhouse
#ROBOMERGE-SOURCE: CL 6417507 via CL 6418864 via CL 6418876 via CL 6418960 via CL 6418983
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6497717 by ben woodhouse in Dev-VR branch]
2019-05-15 14:18:09 -04:00
peter sauerbrei
90fd7e9d38 potential fix for PSO problems
#rb gil.gribb

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: peter.sauerbrei
#ROBOMERGE-SOURCE: CL 6195143 via CL 6195202 via CL 6196410 via CL 6196455
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6238012 by peter sauerbrei in Dev-VR branch]
2019-05-01 21:11:51 -04:00
arciel rekman
cec634e919 Shader Library: use proper shader format names (UE-72416).
- Vulkan (and GL) can have variant names like _NOUB.

#rb Dmitriy.Dyomin
#jira UE-72416
[FYI] Marcin.Undak, Brandon.Schaefer
#lockdown Cristina.Riveron

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 6011769 in //UE4/Release-4.22/... via CL 6011770
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6014731 by arciel rekman in Dev-VR branch]
2019-04-19 13:02:14 -04:00
mark satterthwaite
960fd57181 Initial work to support creating additive 'patch' shader libraries from the metadata of two different cooked builds.
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 5929239 via CL 5933291 via CL 5933354
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5944870 by mark satterthwaite in Dev-VR branch]
2019-04-17 13:40:17 -04:00
richard wallis
9fc683258f Remove the error log (logging still reports internally) and report result back to higher level for it to decide if this is an error - we can not know at the engine level. Soften the language of some of the other internal fail messages to steer the thinking away from errors and more informational.
#rb michael.trepka

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: richard.wallis
#ROBOMERGE-SOURCE: CL 5916504 via CL 5916508 via CL 5917359 via CL 5917425
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5929517 by richard wallis in Dev-VR branch]
2019-04-16 18:00:20 -04:00
pj kack
b21c5947b5 Back out integrated changelist 5586728 (5571078) to resubmit all cook -iterate optimizations implemented on //UE4/Dev-core/... (see 5533504)
New AssetRegistryState::InitializeFromExistingAndPrune temporarily disabled until some bugs have been fixed.

Test Scenario:
1) BuildCookStageAndRun with these arguments: -platform=Win64 -configuration=Development
2) CookIterate with these arguments: -run=Cook -CookCultures=en -TargetPlatform=WindowsClient -unversioned -stdout -unattended -iterate

Wall Time Results (as an average of running step 2) two times):
Before: ~09:40 (580 seconds) cook commandlet time
After: ~02:30 (150 seconds) cook commandlet time
=> 07:10 (430 seconds ) faster, i.e. a ~ 3.9x speedup

Win32 FileSystem Results:
Before: 1.5 million GetFileAttribute calls and 1.2 million FindNextFile calls
After: 35 0000 GetFileAttribute calls and 1.6 million FindNextFile calls
=> ~400 000 calls to FindNextFile replaces ~1.5 million calls to GetFileAttribute

#rb none


(peafour-cherrypick of //UE4/Dev-Core/[at]5645695 by PJ.Kack)

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: pj.kack
#ROBOMERGE-SOURCE: CL 5533504 via CL 5533655 via CL 5536177 via CL 5772728 via CL 5772753 via CL 5772793
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5787307 by pj kack in Dev-VR branch]
2019-04-08 14:08:44 -04:00
bob tellez
a3624c000c Back out changelist 5533504. Crash at startup on forking linux servers. (Missing referencer information)
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 5571078 via CL 5572105 via CL 5572109
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5586437 by bob tellez in Dev-VR branch]
2019-03-27 02:01:56 -04:00
bob tellez
c1ac33c8e4 #UE4 Fix a copy error due to an open file handle in FEditorShaderStableInfo::Finalize. Also added some additional logging in case copy failures happen again in the future.
[FYI] Johan.Berg

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 5550462 via CL 5550501 via CL 5550502
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5552027 by bob tellez in Dev-VR branch]
2019-03-26 01:13:42 -04:00
pj kack
a255328cb8 Copying task stream Dev-cook to Main
Integrate all cook -iterate optimizations from //UE4/Dev-core/...

Test Scenario:
1) BuildCookStageAndRun with these arguments: -platform=Win64 -configuration=Development
2) CookIterate with these arguments: -run=Cook -CookCultures=en -TargetPlatform=WindowsClient -unversioned -stdout -unattended -iterate

Wall Time Results (as an average of running step 2) two times):
Before: ~09:40 (580 seconds) cook commandlet time
After: ~02:30 (150 seconds) cook commandlet time
=> 07:10 (430 seconds ) faster, i.e. a ~ 3.9x speedup

Win32 FileSystem Results:
Before: 1.5 million GetFileAttribute calls and 1.2 million FindNextFile calls
After: 35 0000 GetFileAttribute calls and 1.6 million FindNextFile calls
=> ~400 000 calls to FindNextFile replaces ~1.5 million calls to GetFileAttribute

#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: pj.kack
#ROBOMERGE-SOURCE: CL 5533504 via CL 5533655 via CL 5536177
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5546459 by pj kack in Dev-VR branch]
2019-03-25 17:48:25 -04:00
mark satterthwaite
b07816ee4d Change the ShaderCodeLibrary to only initialise when the project settings require it and make a failure to open the 'Global' shader library fatal for non-Editor builds.
#rb none


#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 5421993 via CL 5421998 via CL 5428544 via CL 5428632
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5432790 by mark satterthwaite in Dev-VR branch]
2019-03-18 13:23:30 -04:00
justin marcus
e0be3df6ca Merging using //Fortnite/Dev-EngineMerge-To-//UE4/Main
Manual merge of CL 4940744 because robomerge had issues.

Original Description:

Merging //Fortnite/Dev-Kairos to Main (//Fortnite/Main)

Getting ready for Install Bundle Manager merge to main.  These are Engine/Core fixes


4440445
Fix FBuildPatchInstaller::Initialize() failing for manifests that did not include the empty tag.

#jira no jira
#rb Leigh.Swift


4474598
Add Android Macros to disable optimization
Fix Android directory iteration for OBBs.  FindFilesRecursive() now works.
#jira UEATM-177
#rb Chris.Babcock

4487221
Android file - When mounting an OBB, fix possibly mounting directories as files.
#rb Chris.Babcock

4511214
Fix Android directory iteration not returning the visitor result.  This would cause IPlatformFile::FindFilesRecursively() to prematurely end iteration.
#rb Chris.Babcock

4670945
Fix GetVarArgs format specifier off by 1 error.  These would only show up if you had the format specifier at the end of the format string and only with 'l' and not 'll'.  In that case the code would walk off the end of the format string, usually into another static string.

Fix GetVarArgs to never walk off the end of the format string.

#rb [at]ben.ziegler

4746778
Fix FShaderCodeEntry ref counts being off by one.
This bug was exposed because [Project Name Redacted] doesn't load shaderlibs or the PSO cache until well after engine init.  That means some FShaderResource's are loaded before shader libs or PSO cache and FShaderCodeLibrary::RequestShaderCode() can fail in FShaderResource::SerializeShaderCode().

#rb [at]Gil.Gribb [at]Chris.Babcock

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 4948018 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5026240 by justin marcus in Dev-VR branch]
2019-02-16 03:35:11 -05:00
Joe Conley
c12a880a0c Unshelved from pending changelist '4791207':
Source=CL 4772220 in //UE4/Main/...
Acknowledger=joe.conley (Thu Jan 24 2019 00:26:59 GMT+0000 (Coordinated Universal Time))
ShelfCl=4791207
Target=Dev-VR
Merge conflict:
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp - merging //UE4/Main/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp#5

#rb Ryan.Vance

[CL 4792243 by Joe Conley in Dev-VR branch]
2019-01-23 19:56:41 -05:00
Ryan Vance
7c51ff94af Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
CL 1 of 8
#rb integration

[CL 4748712 by Ryan Vance in Dev-VR branch]
2019-01-17 18:54:05 -05:00
jason bestimt
9a64d93526 --------------------------------------
Copying //UE4/Dev-Rendering[at]4626416 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown nick.penwarden

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4626501 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4627410 by jason bestimt in Dev-VR branch]
2018-12-04 09:59:43 -05:00