Synchronize frame group thumbnails with filmstrip.

Fixes: #1056
google · Sep 12, 2017 · c5bbcc8 · c5bbcc8
1 parent 45e31f5
commit c5bbcc8
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/gapis/resolve/command_tree.go b/gapis/resolve/command_tree.go
@@ -393,7 +393,10 @@ func addFrameGroups(ctx context.Context, events *service.Events, p *path.Command
 			// However, we can not reliably detect this situation as the user
 			// group might be surrounded by (potentially filtered) commands.
 
-			t.root.AddGroup(frameStart, frameEnd+1, fmt.Sprintf("Frame %v", frameCount))
+			group, _ := t.root.AddGroup(frameStart, frameEnd+1, fmt.Sprintf("Frame %v", frameCount))
+			if group != nil {
+				group.UserData = &CommandTreeNodeUserData{Thumbnail: i}
+			}
 		}
 	}
 	if p.AllowIncompleteFrame && frameCount > 0 && frameStart > frameEnd {
@@ -402,9 +405,16 @@ func addFrameGroups(ctx context.Context, events *service.Events, p *path.Command
 }
 
 func setThumbnails(ctx context.Context, g *api.CmdIDGroup, drawOrClearCmds api.Spans) {
-	if s, c := interval.Intersect(drawOrClearCmds, g.Bounds().Span()); c > 0 {
-		thumbnail := drawOrClearCmds[s+c-1].Bounds().Start
-		g.UserData = &CommandTreeNodeUserData{Thumbnail: thumbnail}
+	data, _ := g.UserData.(*CommandTreeNodeUserData)
+	if data == nil {
+		data = &CommandTreeNodeUserData{Thumbnail: api.CmdNoID}
+		g.UserData = data
+	}
+	if data.Thumbnail == api.CmdNoID {
+		if s, c := interval.Intersect(drawOrClearCmds, g.Bounds().Span()); c > 0 {
+			thumbnail := drawOrClearCmds[s+c-1].Bounds().Start
+			g.UserData = &CommandTreeNodeUserData{Thumbnail: thumbnail}
+		}
 	}
 
 	for _, s := range g.Spans {