Commit Graph

490 Commits

Author SHA1 Message Date
jason adcock
cc9e67fb33 Resubmit CL-5012232
#ROBOMERGE-SOURCE: CL 5015453 via CL 5022338

[CL 5041403 by jason adcock in Main branch]
2019-02-18 13:53:37 -05:00
ethan geller
13b87a7b45 #rb aaron.mcleran
#lockdown bob.tellez
[REVIEW]


#ROBOMERGE-SOURCE: CL 5012936 via CL 5012937 via CL 5012939 via CL 5014386

[CL 5040447 by ethan geller in Main branch]
2019-02-18 13:21:51 -05:00
bob tellez
0bcdfaa4cd Back out changelist 5012232. CIS errors
[FYI] Jason.Adcock


#ROBOMERGE-SOURCE: CL 5012391 via CL 5014154

[CL 5040042 by bob tellez in Main branch]
2019-02-18 13:17:34 -05:00
jason adcock
106f785f7b VoiceEngineImpl Update to handle Win Audio Device Changes
[CODEREVIEW] ethan.geller


#ROBOMERGE-SOURCE: CL 5012232 via CL 5014116

[CL 5039775 by jason adcock in Main branch]
2019-02-18 13:13:23 -05:00
jonas meyer
d3af8027a0 Reenable 32bit depth.
Change OVR to also 32bit depth.
#jira UE-68470 UE-39577
[FYI] rolando.caloca
#rb none

#ROBOMERGE-SOURCE: CL 5037751 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5037760 by jonas meyer in Main branch]
2019-02-18 11:42:15 -05:00
ethan geller
118146b473 Fix for Client Crash in OggReadStreaming
#rb Bob.Tellez


#ROBOMERGE-SOURCE: CL 4996167 via CL 4996177 via CL 4996179 via CL 4996478

[CL 5000252 by ethan geller in Main branch]
2019-02-14 17:16:01 -05:00
juan canada
ac58ad5e6b Copying //UE4/Private-Woodchuck-Staging[at]4997051 to Release-4.22 (//UE4/Release-4.22)
#rb none
#jira
[FYI] marcus.wassmer
[FYI] zachary.wilson

#ROBOMERGE-SOURCE: CL 4997195 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4997198 by juan canada in Main branch]
2019-02-14 14:23:27 -05:00
aaron mcleran
5eb8463dfb Fixing xma2 streaming for audio mixer
#rb David.Harvey


#ROBOMERGE-SOURCE: CL 4986686 via CL 4987886 via CL 4988806

[CL 4993624 by aaron mcleran in Main branch]
2019-02-14 09:51:24 -05:00
jonas meyer
fd87c5a8e7 github #5020
Added formats requested + additional missing formats. Both d3d11 and d3d12
#rb rolando.caloca
#JIRA UE-63199

#ROBOMERGE-SOURCE: CL 4981375 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4981376 by jonas meyer in Main branch]
2019-02-13 05:03:00 -05:00
nick caplinger
21fa3b8962 Change XAudio2_7 dll unloading so that it is only unloaded when the engine is shutting down as opposed to when devices are lost.
* Modify how the XAudio2_7 dll is loaded/unloaded such that its lifetime matches the engine lifetime rather than a single device's lifetime.
* This may mitigate a potential deadlock from occuring when attempting to free XAudio2 resources, such as when calling DestroyVoice.
* More details here: https://blogs.msdn.microsoft.com/chuckw/2015/10/09/known-issues-xaudio-2-7/

#rb Daniel.Broder, Aaron.Mcleran
[FYI] Aaron.Mcleran


#ROBOMERGE-SOURCE: CL 4975639 via CL 4975643 via CL 4975986

[CL 4978019 by nick caplinger in Main branch]
2019-02-12 18:36:15 -05:00
david harvey
dfe6ae3eee preparation work for XMA2 streaming:
- streamed decompression honours 'NumCompressedBytesConsumed'.
 - audio encoder indicates whether the sound is being cooked for streaming or not.
 - some XMA format checks.

#rb aaron.mcleran


#ROBOMERGE-SOURCE: CL 4930005 via CL 4930006 via CL 4939875

[CL 4939940 by david harvey in Main branch]
2019-02-07 19:37:39 -05:00
chris bunner
b0a369dd95 Added some logging for a previously silent failure during D3D11 adapter enumeration in the hopes of catching a rare failure case.
#rb Jian.Ru, Rolando.Caloca


#ROBOMERGE-SOURCE: CL 4923700 via CL 4927264

[CL 4932744 by chris bunner in Main branch]
2019-02-07 10:41:19 -05:00
Jian Ru
924462f628 Resolve robomerge conflicts
#jira none
#rb none
#fyi chris.bunner, jeff.williams

[CL 4920023 by Jian Ru in Main branch]
2019-02-06 09:46:41 -05:00
Rolando Caloca
0c3a2062fe Unshelved from pending changelist '4864895':
#CodeReview: rolando.caloca,jeff.williams

Merge conflict.
rolando.caloca, please merge this change by hand.
More info at https://robomerge.epicgames.net#FORTNITE

/src/robomerge_ue4_main_01/Engine/Source/Runtime/RHI/Public/RHICommandList.h - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/RHI/Public/RHICommandList.h#6


--------------------------------------
FN - Some RHIs don't have support for FRHICopyTextureInfo::NumMips yet
#rb none
[CODEREVIEW] Michael.Dupuis
#rnx


#ROBOMERGE-SOURCE: CL 4859824 via CL 4864762

[CL 4865689 by Rolando Caloca in Main branch]
2019-02-01 09:53:46 -05:00
aaron mcleran
417932b60d Possible fix for stream crash and extra logging in vorbis decoder.
#rb Rob.Gay


#ROBOMERGE-SOURCE: CL 4853473 via CL 4854691

[CL 4854737 by aaron mcleran in Main branch]
2019-01-30 23:18:41 -05:00
Marcus Wassmer
70e5db4e65 Merging //UE4/Dev-Main@4854321 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
#lockdown rolando.caloca

[CL 4854522 by Marcus Wassmer in Dev-Rendering branch]
2019-01-30 20:51:13 -05:00
Marcus Wassmer
6995e20184 Merging //UE4/Dev-Main@4848702 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
#lockdown rolando.caloca

[CL 4854488 by Marcus Wassmer in Dev-Rendering branch]
2019-01-30 20:34:55 -05:00
Marcus Wassmer
68f340a63c Merging //UE4/Dev-Main@4825910 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
KNOWN BROKEN DO NOT SYNC
#lockdown rolando.caloca

[CL 4827063 by Marcus Wassmer in Dev-Rendering branch]
2019-01-28 21:04:21 -05:00
Yuriy ODonnell
d488ee7677 EShaderFrequency no longer depends on whether RHI_RAYTRACING is enabled. All frequencies are always defined. Some of the usage of SF_NumFrequencies is replaced with SF_NumStandardFrequencies to avoid memory and run-time overhead.
#lockdown rolando.caloca
#rb rolando.caloca
#jira UE-67956

[CL 4822693 by Yuriy ODonnell in Dev-Rendering branch]
2019-01-28 09:49:53 -05:00
Rolando Caloca
fa661dc3c0 DR - Copying //UE4/Dev-Main@4791431 to //UE4-DevRendering
#rb none
#rnx
#lockdown Marcus.Wassmer

[CL 4791510 by Rolando Caloca in Dev-Rendering branch]
2019-01-23 17:49:19 -05:00
Rolando Caloca
732810a13b DR - Copying //UE4/Dev-Main@4785067 to //UE4-DevRendering
#rb none
#rnx
#lockdown Marcus.Wassmer

[CL 4790611 by Rolando Caloca in Dev-Rendering branch]
2019-01-23 17:01:56 -05:00
Rolando Caloca
c744825290 DR - Change default back to 24-bit depth buffers as that is incompatible with Oculus
#rb none
#codereview Jonas.Meyer
#lockdown Marcus.Wassmer
#jira UE-68470

[CL 4784765 by Rolando Caloca in Dev-Rendering branch]
2019-01-23 14:05:52 -05:00
Brian Karis
572ec04b6c Render graph updates
#rb guillaume.abadie

[CL 4757657 by Brian Karis in Dev-Rendering branch]
2019-01-18 19:20:21 -05:00
Marcus Wassmer
fee98d3ca5 Merging //UE4/Dev-Main@4729937 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4730169 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:30:06 -05:00
Marcus Wassmer
a8d6cc952b Merging //UE4/Dev-Main@4700769 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4729861 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:04:38 -05:00