mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'profiling' into actually_profiling

Browse source
This commit is contained in:
Andy Adshead 2019-02-01 03:01:51 +00:00
commit b79fa29edc
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ryujinx.Profiler/InternalProfile.cs
View file

@ -152,6 +152,13 @@ namespace Ryujinx.Profiler
_preserve = PerformanceCounter.ElapsedTicks; _preserve = PerformanceCounter.ElapsedTicks;
ClearTimerQueue(); ClearTimerQueue();
// Reset all instant counts
foreach (KeyValuePair<ProfileConfig, TimingInfo> timer in Timers)
{
timer.Value.Instant = 0;
timer.Value.InstantCount = 0;
}
return Timers; return Timers;
} }

9
Ryujinx.Profiler/UI/ProfileWindow.cs
View file

@ -401,6 +401,9 @@ namespace Ryujinx.Profiler.UI
verticalIndex = 0; verticalIndex = 0;
foreach (var entry in _sortedProfileData) foreach (var entry in _sortedProfileData)
{ {
if (entry.Key.Category == null)
continue;
float y = GetLineY(yOffset, LineHeight, LinePadding, true, verticalIndex++); float y = GetLineY(yOffset, LineHeight, LinePadding, true, verticalIndex++);
width = _fontService.DrawText(entry.Key.Category, xOffset, y, LineHeight); width = _fontService.DrawText(entry.Key.Category, xOffset, y, LineHeight);
@ -426,6 +429,9 @@ namespace Ryujinx.Profiler.UI
GL.Enable(EnableCap.ScissorTest); GL.Enable(EnableCap.ScissorTest);
foreach (var entry in _sortedProfileData) foreach (var entry in _sortedProfileData)
{ {
if (entry.Key.SessionGroup == null)
continue;
float y = GetLineY(yOffset, LineHeight, LinePadding, true, verticalIndex++); float y = GetLineY(yOffset, LineHeight, LinePadding, true, verticalIndex++);
width = _fontService.DrawText(entry.Key.SessionGroup, xOffset, y, LineHeight); width = _fontService.DrawText(entry.Key.SessionGroup, xOffset, y, LineHeight);
@ -450,6 +456,9 @@ namespace Ryujinx.Profiler.UI
GL.Enable(EnableCap.ScissorTest); GL.Enable(EnableCap.ScissorTest);
foreach (var entry in _sortedProfileData) foreach (var entry in _sortedProfileData)
{ {
if (entry.Key.SessionItem == null)
continue;
float y = GetLineY(yOffset, LineHeight, LinePadding, true, verticalIndex++); float y = GetLineY(yOffset, LineHeight, LinePadding, true, verticalIndex++);
width = _fontService.DrawText(entry.Key.SessionItem, xOffset, y, LineHeight); width = _fontService.DrawText(entry.Key.SessionItem, xOffset, y, LineHeight);