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
161,059 Commits 23 Branches 254 Tags
1ddeb68eeefe1302ebfd0ba714be1c84884d0f92
Commit Graph

17 Commits

Author SHA1 Message Date
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main 
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
 2021-03-05 19:27:14 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250 
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
 2021-01-21 16:22:06 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main 
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
 2021-01-08 19:56:07 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662 
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
 2020-10-22 19:19:16 -04:00
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
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157 
[CL 14233282 by Marc Audy in ue5-main branch]
 2020-09-01 14:07:48 -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
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
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
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
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main 
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
 2019-10-11 15:33:31 -04: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
Nick Shin
3526d16d5e merge/copyup to parent stream - HTML5 platform extension 
#jira UEMOB-482  HTML5 platform as a plug in
#rb josh.adams
#rn

[CL 9306021 by Nick Shin in Dev-Build branch]
 2019-09-30 15:13:56 -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