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

Column titles

Browse source
This commit is contained in:
Andy Adshead 2019-01-26 06:28:40 +00:00
commit 5ba0b07180
1 changed files with 40 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ namespace Ryujinx
private Dictionary<ProfileConfig, TimingInfo> profileData; private Dictionary<ProfileConfig, TimingInfo> profileData;
private float scrollPos = 0; private float scrollPos = 0;
private float maxScroll = 0; private float minScroll = 0, maxScroll = 0;
public ProfileWindow() public ProfileWindow()
: base(400, 720) : base(400, 720)
@ -115,14 +115,19 @@ namespace Ryujinx
fontService.fontColor = Color.White; fontService.fontColor = Color.White;
int verticalIndex = 0; int verticalIndex = 0;
int lineHeight = 12; int lineHeight = 12;
int titleHeight = 24;
int titleFontHeight = 16;
int linePadding = 2; int linePadding = 2;
int columnSpacing = 30; int columnSpacing = 30;
float width;
float maxWidth = 0; float maxWidth = 0;
float yOffset = scrollPos; float yOffset = scrollPos - titleHeight;
float xOffset = 10; float xOffset = 10;
// Background lines to make reading easier // Background lines to make reading easier
GL.Enable(EnableCap.ScissorTest);
GL.Scissor(0, 0, Width, Height - titleHeight);
GL.Begin(PrimitiveType.Triangles); GL.Begin(PrimitiveType.Triangles);
GL.Color3(0.2f, 0.2f, 0.2f); GL.Color3(0.2f, 0.2f, 0.2f);
for (int i = 0; i < profileData.Count; i += 2) for (int i = 0; i < profileData.Count; i += 2)
@ -144,50 +149,77 @@ namespace Ryujinx
foreach (var entry in profileData) foreach (var entry in profileData)
{ {
float y = yOffset + Height - (lineHeight + linePadding) * (verticalIndex++ + 1); float y = yOffset + Height - (lineHeight + linePadding) * (verticalIndex++ + 1);
float width = fontService.DrawText(entry.Key.Category, xOffset, y, lineHeight); width = fontService.DrawText(entry.Key.Category, xOffset, y, lineHeight);
if (width > maxWidth) if (width > maxWidth)
{ {
maxWidth = width; maxWidth = width;
} }
} }
GL.Disable(EnableCap.ScissorTest);
width = fontService.DrawText("Category", xOffset, Height - titleFontHeight, titleFontHeight);
if (width > maxWidth)
maxWidth = width;
xOffset += maxWidth + columnSpacing; xOffset += maxWidth + columnSpacing;
// Display session group // Display session group
maxWidth = 0; maxWidth = 0;
verticalIndex = 0; verticalIndex = 0;
GL.Enable(EnableCap.ScissorTest);
foreach (var entry in profileData) foreach (var entry in profileData)
{ {
float y = yOffset + Height - (lineHeight + linePadding) * (verticalIndex++ + 1); float y = yOffset + Height - (lineHeight + linePadding) * (verticalIndex++ + 1);
float width = fontService.DrawText(entry.Key.SessionGroup, xOffset, y, lineHeight); width = fontService.DrawText(entry.Key.SessionGroup, xOffset, y, lineHeight);
if (width > maxWidth) if (width > maxWidth)
{ {
maxWidth = width; maxWidth = width;
} }
} }
GL.Disable(EnableCap.ScissorTest);
width = fontService.DrawText("Group", xOffset, Height - titleFontHeight, titleFontHeight);
if (width > maxWidth)
maxWidth = width;
xOffset += maxWidth + columnSpacing; xOffset += maxWidth + columnSpacing;
// Display session item // Display session item
maxWidth = 0; maxWidth = 0;
verticalIndex = 0; verticalIndex = 0;
GL.Enable(EnableCap.ScissorTest);
foreach (var entry in profileData) foreach (var entry in profileData)
{ {
float y = yOffset + Height - (lineHeight + linePadding) * (verticalIndex++ + 1); float y = yOffset + Height - (lineHeight + linePadding) * (verticalIndex++ + 1);
float width = fontService.DrawText(entry.Key.SessionItem, xOffset, y, lineHeight); width = fontService.DrawText(entry.Key.SessionItem, xOffset, y, lineHeight);
if (width > maxWidth) if (width > maxWidth)
{ {
maxWidth = width; maxWidth = width;
} }
} }
GL.Disable(EnableCap.ScissorTest);
width = fontService.DrawText("Item", xOffset, Height - titleFontHeight, titleFontHeight);
if (width > maxWidth)
maxWidth = width;
xOffset += maxWidth + columnSpacing; xOffset += maxWidth + columnSpacing;
// Display timestamps // Display timestamps
verticalIndex = 0; verticalIndex = 0;
GL.Enable(EnableCap.ScissorTest);
foreach (var entry in profileData) foreach (var entry in profileData)
{ {
float y = yOffset + Height - (lineHeight + 2) * (verticalIndex++ + 1); float y = yOffset + Height - (lineHeight + 2) * (verticalIndex++ + 1);
fontService.DrawText($"{entry.Value.AverageTime:F3}", xOffset, y, lineHeight); fontService.DrawText($"{entry.Value.AverageTime:F3}", xOffset, y, lineHeight);
fontService.DrawText($"{entry.Value.LastTime:F3}", columnSpacing + 50 + xOffset, y, lineHeight); fontService.DrawText($"{entry.Value.LastTime:F3}", columnSpacing + 100 + xOffset, y, lineHeight);
} }
GL.Disable(EnableCap.ScissorTest);
fontService.DrawText("Average (ms)", xOffset, Height - titleFontHeight, titleFontHeight);
fontService.DrawText("Instant (ms)", columnSpacing + 100 + xOffset, Height - titleFontHeight, titleFontHeight);
SwapBuffers(); SwapBuffers();
} }
@ -208,8 +240,8 @@ namespace Ryujinx
protected override void OnMouseWheel(MouseWheelEventArgs e) protected override void OnMouseWheel(MouseWheelEventArgs e)
{ {
scrollPos += e.Delta * -30; scrollPos += e.Delta * -30;
if (scrollPos < 0) if (scrollPos < minScroll)
scrollPos = 0; scrollPos = minScroll;
if (scrollPos > maxScroll) if (scrollPos > maxScroll)
scrollPos = maxScroll; scrollPos = maxScroll;
} }