From 2dde5ee52d1c10fddc5e29a3871f97fee0469b15 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 25 Apr 2015 15:59:58 +0200 Subject: [PATCH] Make sure MultiDraw calls properly create timeline bar sections --- renderdocui/Windows/TimelineBar.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/renderdocui/Windows/TimelineBar.cs b/renderdocui/Windows/TimelineBar.cs index 49569d135..644324f95 100644 --- a/renderdocui/Windows/TimelineBar.cs +++ b/renderdocui/Windows/TimelineBar.cs @@ -322,16 +322,16 @@ namespace renderdocui.Windows if (m_Core.Config.EventBrowser_HideEmpty) { - if ((d.children == null || d.children.Length == 0) && (d.flags & DrawcallFlags.PushMarker) != 0) + if ((d.children == null || d.children.Length == 0) && (d.flags & (DrawcallFlags.PushMarker | DrawcallFlags.MultiDraw)) != 0) continue; } - bool newSection = ((d.flags & DrawcallFlags.PushMarker) > 0 || sections.Count == 0); + bool newSection = ((d.flags & (DrawcallFlags.PushMarker|DrawcallFlags.MultiDraw)) > 0 || sections.Count == 0); if (!newSection) { var lastSection = sections.Last(); - if (lastSection.Count == 1 && (lastSection[0].flags & DrawcallFlags.PushMarker) > 0) + if (lastSection.Count == 1 && (lastSection[0].flags & (DrawcallFlags.PushMarker | DrawcallFlags.MultiDraw)) > 0) newSection = true; } @@ -348,7 +348,7 @@ namespace renderdocui.Windows { Section sec = null; - if (s.Count == 1 && (s[0].flags & DrawcallFlags.PushMarker) > 0) + if (s.Count == 1 && (s[0].flags & (DrawcallFlags.PushMarker | DrawcallFlags.MultiDraw)) > 0) { sec = GatherEvents(s[0].children); sec.Name = s[0].name;