Commit Graph

320 Commits

Author SHA1 Message Date
juan canada
d3ed04f590 Added support for static samplers for D3D12 shaders compiled with DXC for PC.
#rb Rolando.Caloca
#jira none


#ushell-cherrypick of 12581778 by Yuriy.ODonnell

#ROBOMERGE-SOURCE: CL 12624927 in //UE4/Release-4.25/... via CL 12624931 via CL 12624933
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12624936 by juan canada in Main branch]
2020-04-06 13:21:00 -04:00
ben marsh
ff0c64df6d Fix some non-unity issues building LiveCodingConsole.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 12394810 in //UE4/Release-4.25/... via CL 12394948
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Release-Engine-Staging) (v671-12333473)

[CL 12419899 by ben marsh in Release-Engine-Staging branch]
2020-03-25 12:22:58 -04:00
Ben Marsh
ad49792031 Fix some non-unity issues building LiveCodingConsole.
#rb none
#rnx
#jira

[CL 12394810 by Ben Marsh in 4.25 branch]
2020-03-24 18:51:49 -04:00
dmitriy dyomin
a8a1c6521b Fixed: Reflection capture related crash running DirectX mobile emulation (Contributed by SertacOgan)
PR #6585
#jira UE-87259
#rb none

#ROBOMERGE-SOURCE: CL 12192346 in //UE4/Release-4.25/... via CL 12192347
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v662-12191386)

[CL 12192349 by dmitriy dyomin in Main branch]
2020-03-16 02:00:07 -04:00
Dmitriy Dyomin
d119134069 Fixed: Reflection capture related crash running DirectX mobile emulation (Contributed by SertacOgan)
PR #6585
#jira UE-87259
#rb none

[CL 12192346 by Dmitriy Dyomin in 4.25 branch]
2020-03-16 01:59:22 -04:00
josh adams
dc70e4b5cf Fixed leftover line from a bad merge
#rb trivial
#rnx


#ROBOMERGE-SOURCE: CL 12158996
#ROBOMERGE-BOT: (v659-12123632)

[CL 12158998 by josh adams in Main branch]
2020-03-12 22:46:44 -04:00
maxwell hayes
4505c46850 changing FAudioChunkCache::GetChunk() so if it is called with bBlockForLoadCompletion it will perform that load synchronously instead of starting and waiting for an Async task
#rb ethan.geller


#ROBOMERGE-OWNER: maxwell.hayes
#ROBOMERGE-AUTHOR: maxwell.hayes
#ROBOMERGE-SOURCE: CL 12156681 via CL 12156814
#ROBOMERGE-BOT: (v659-12123632)

[CL 12156824 by maxwell hayes in Main branch]
2020-03-12 18:29:42 -04:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -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
Ben Marsh
e5c1cf2274 Fix static analysis warning.
#rb none
#rnx
#jira UE-87765

[CL 11199518 by Ben Marsh in Main branch]
2020-01-31 15:18:30 -05:00
Rolando Caloca
f63a3e857e Merging //UE4/Main@11178322 to Dev-RenderPlat-Staging
#rnx
#rb none

[CL 11195678 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2020-01-31 10:34:10 -05:00
Ben Marsh
0e6aa011b3 Copying //UE4/Dev-Build @ CL 11166028 to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 11166227 by Ben Marsh in Main branch]
2020-01-29 14:48:18 -05:00
Rolando Caloca
bbb9564388 Copying //UE4/Dev-RenderPlat-Staging@11110326 to //UE4/Main
#rb none
#rnx

[CL 11110369 by Rolando Caloca in Main branch]
2020-01-24 18:07:01 -05:00
Rolando Caloca
db7cb13cd5 Merging //UE4/Main@11108668 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 11109810 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2020-01-24 17:26:14 -05:00
graeme thornton
5059d3cb48 Make UAT use a config setting to decide which editor target is the default for use within automation scripts
Have UBT set the source target name as a define during compilation. For unique environments, embed that macro globally, but in shared environments just embed it into game modules.
Have the primary game module bind that define to a core delegate so engine systems can query it
Make LiveCodingModule pass the UBT target name to the UBT so that it doesn't have to guess which target to build
For agnostic executables (UE4Game, UE4Editor)  running content only projects, the delegate won't be bound, so revert back to type based recompile requests in live coding
Handle DTE string for VS2019 in the source code accessor module

#rb ben.marsh


#ROBOMERGE-SOURCE: CL 11103653 via CL 11103654 via CL 11103656
#ROBOMERGE-BOT: (v640-11091645)

[CL 11103658 by graeme thornton in Main branch]
2020-01-24 03:22:33 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05:00
ryan durand
d278f1012f Updating copyright for Engine Developer.
#rnx
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902 via CL 10870584
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v613-10869866)

[CL 10871012 by ryan durand in Dev-Build branch]
2019-12-27 01:09:11 -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
robert manuszewski
7f79bbd140 Copying //UE4/Dev-Core [at] 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 10708666 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)

[CL 10820551 by robert manuszewski in Dev-Build branch]
2019-12-19 14:30:47 -05:00
Rolando Caloca
c2d62c0ecc Copying //UE4/Dev-Rendering@10763356 to //UE4/Dev-RenderPlat-Staging
#rb none
#rnx

[CL 10769097 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-12-17 14:14:23 -05:00
ethan geller
7696e83ca1 Back out changelist 9826412 to fix patch diff in cook.
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 10221882 via CL 10222025 via CL 10222065 via CL 10222106 via CL 10222163
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)

[CL 10749000 by ethan geller in Dev-Build branch]
2019-12-16 17:24:15 -05:00
jonas meyer
e0e498761d Stats for for shaders compiled by materials
- CookByTheBook now outputs a .csv file into Saved/MaterialStats
- Statistics View now lists all the csv files from that folder.
- Load is done lazily
- Added shortcut key in Asset Browser
- MaterialPath is now serialized into shadermap(if debug info is allowed)
#rb lauren.barnes

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jonas.meyer
#ROBOMERGE-SOURCE: CL 10124522 via CL 10124571 via CL 10125114
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)

[CL 10744663 by jonas meyer in Dev-Build branch]
2019-12-16 16:16:22 -05:00
lukas hermanns
f77b04bfaa Enabled DXC multiline error messages in output log.
#rb none
#jira UE-83064
[FYI] Yujiang.Wang, Rolando.Caloca
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lukas.hermanns
#ROBOMERGE-SOURCE: CL 10087195 in //UE4/Release-4.24/... via CL 10087205
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)

[CL 10736995 by lukas hermanns in Dev-Build branch]
2019-12-16 11:44:24 -05:00
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
Ben Marsh
403204ae43 Live Coding: Fix process group names being derived from relative paths, resulting in two workspaces using the same project sharing the same name (causing changes in one project to show up in the other's console window)
#rb none
#rnx

[CL 10608414 by Ben Marsh in Dev-Build branch]
2019-12-07 19:03:02 -05:00