Commit Graph

13 Commits

Author SHA1 Message Date
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
PJ Kack
3a9ca4d2f9 Merging //UE4/Main @ 11112898 to //UE4/Dev-Core (dev-core-l0178)
#rb none

(ushell-p4-mergedown)

[CL 11113592 by PJ Kack in Dev-Core branch]
2020-01-26 11:33:22 -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
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
Marcus Wassmer
b89a1e5351 Copying //UE4/Dev-Mobile@9319092 to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none

[CL 9319120 by Marcus Wassmer in Dev-RenderPlat-Staging branch]
2019-10-01 14:51:40 -04:00
Rolando Caloca
f83ae4807a Copying //UE4/Dev-Rendering@9317594 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9317904 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-01 13:03:04 -04:00
steve robb
14cab21e0c Deprecating ARRAY_COUNT and changing it to UE_ARRAY_COUNT.
Replicated from CL# 7924370.

#rb none


#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 9279060 via CL 9279063
#ROBOMERGE-BOT: (v443-9013191)

[CL 9279836 by steve robb in Main branch]
2019-09-28 08:19:35 -04:00
jian ru
27715ce159 Do not allocate timestamp queries on unsupported platforms
#ROBOMERGE-SOURCE: CL 8387561 via CL 8389724
#ROBOMERGE-BOT: (v403-8382528)

[CL 8389776 by jian ru in Main branch]
2019-08-31 02:10:54 -04:00
jian ru
f1859df61a Fix compile errors
#ROBOMERGE-SOURCE: CL 8383275 via CL 8383566
#ROBOMERGE-BOT: (v403-8382528)

[CL 8383627 by jian ru in Main branch]
2019-08-30 10:51:14 -04:00
james hopkin
9ce659f0e1 Compile fix for tools build
#ROBOMERGE-SOURCE: CL 8383026 via CL 8383185
#ROBOMERGE-BOT: (v403-8382528)

[CL 8383209 by james hopkin in Main branch]
2019-08-30 09:58:36 -04:00
jian ru
ced7e8883a Redo CL 8374078 to resolve merge conflict - Reduce FRealtimeGPUProfiler overhead
#rb Ben.Woodhouse,Jonas.Meyer,Rolando.Caloca


#ROBOMERGE-SOURCE: CL 8375899 via CL 8380119
#ROBOMERGE-BOT: (v402-8361577)

[CL 8380167 by jian ru in Main branch]
2019-08-29 19:40:50 -04:00
michal valient
bfdcead4ed Fixed dereferencing null ptr in FRealtimeGPUProfiler at exit
#jira UE-76546
#rb marcus.wassmer

#ROBOMERGE-SOURCE: CL 7277248 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v369-7254125)

[CL 7277251 by michal valient in Main branch]
2019-07-11 12:57:57 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00