izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
157,157 Commits 23 Branches 254 Tags
db463b031d42484bf7ff2b057a8bf0c94dea4a9c
Commit Graph

23 Commits

Author SHA1 Message Date
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769 
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
 2020-09-24 00:43:27 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166 
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
 2020-08-11 01:36:57 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main) 
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
 2020-06-23 18:40:00 -04:00
michael sartain
cba2fafd66 Ensure start time for events is greater than last end time for all nodes 
#jira UE-89825
#ryi Yujiang.Wang, Arciel.Rekman
#rb none

#ROBOMERGE-SOURCE: CL 12167281 in //UE4/Release-4.25/... via CL 12167285
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12167294 by michael sartain in Main branch]
 2020-03-13 16:37:04 -04:00
michael sartain
24658e3f19 Clamp GpuProfilerEvent times to valid values plus remove unused variables 
SanitizeEventTree was not clamping start times to be >= to previous root start times, so
we were hitting asserts in TraverseEventTree() for:

    lastStartTime >= GpuProfilerEvents[Root].GetStartResultMicroseconds()

This CL should sanitize all start/end time values

#jira UE-89825
#rb Yujiang.Wang, Arciel.Rekman
[FYI] Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 12142863 in //UE4/Release-4.25/... via CL 12142872
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12142890 by michael sartain in Main branch]
 2020-03-11 18:08:11 -04:00
mickael gilabert
4bdf873490 Fixed CIS 
#rb trivial
#rnx


#ROBOMERGE-SOURCE: CL 11969245 via CL 11969250 via CL 11969256 via CL 11969258
#ROBOMERGE-BOT: (v656-11643781)

[CL 11969260 by mickael gilabert in Main branch]
 2020-03-05 18:34:08 -05:00
mickael gilabert
d26c6ac118 Added DEFINE_GPU_DRAWCALL_STAT to get drawcall count per specific category 
Use DEFINE_GPU_DRAWCALL_STAT macro instead of DEFINE_GPU_STAT to also get drawcall count in CSV for a specific pass.
SCOPED_GPU_STAT will then output CSV time for GPU pass and number of drawcalls of this GPU pass in CSV Drawcall category

#rb jian.ru, rolando.olivares


#ROBOMERGE-OWNER: mickael.gilabert
#ROBOMERGE-AUTHOR: mickael.gilabert
#ROBOMERGE-SOURCE: CL 11966987 via CL 11967000 via CL 11967012 via CL 11967030
#ROBOMERGE-BOT: (v656-11643781)

[CL 11967730 by mickael gilabert in Main branch]
 2020-03-05 17:55:22 -05:00
carl lloyd
4720415a87 Fix for missing GPU Stats enabled tests in RealtimeGPUProfiler 
[at]Dmitriy.Dyomin
#rb Dmitriy.Dyomin
#jira none

#ROBOMERGE-SOURCE: CL 11575404 in //UE4/Release-4.25/... via CL 11575408
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11585249 by carl lloyd in Main branch]
 2020-02-22 17:03:22 -05:00
yujiang wang
2529f900f0 Add missing part of UnrealInsights GPU track improvements (from Dev-Rendering) 
* Take Dev-Rendering if any conflict happens

#rb none
#jira none

#ROBOMERGE-SOURCE: CL 11556366 in //UE4/Release-4.25/... via CL 11556370
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11579520 by yujiang wang in Main branch]
 2020-02-21 17:41:43 -05:00
yujiang wang
885dd76ffa UE-89171: Clamp GPU profiler events start and end timestamps 
#rb none
#jira UE-89171

#ROBOMERGE-SOURCE: CL 11555948 in //UE4/Release-4.25/... via CL 11555950
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11579504 by yujiang wang in Main branch]
 2020-02-21 17:41:26 -05:00
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