Fix crashes when tracing vkCmdExecuteCommands (#1187)

google · Oct 11, 2017 · 8e52d95 · 8e52d95
1 parent 961fcad
commit 8e52d95
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gapis/api/vulkan/footprint_builder.go b/gapis/api/vulkan/footprint_builder.go
@@ -2341,6 +2341,9 @@ func (vb *FootprintBuilder) BuildFootprint(ctx context.Context,
 				read(ctx, bh, vkHandle(vkCb))
 				read(ctx, bh, vb.commandBuffers[vkCb].end)
 				for k, cbc := range vb.commands[vkCb] {
+					fci := api.SubCmdIdx{uint64(id), uint64(i), uint64(j), uint64(k)}
+					submittedCmd := newSubmittedCommand(fci, cbc, nil)
+					vb.submitInfos[id].pendingCommands = append(vb.submitInfos[id].pendingCommands, submittedCmd)
 					if cbc.isCmdExecuteCommands {
 						for scbi, scb := range cbc.secondaryCommandBuffers {
 							read(ctx, bh, vb.commandBuffers[scb].end)
@@ -2351,9 +2354,6 @@ func (vb *FootprintBuilder) BuildFootprint(ctx context.Context,
 							}
 						}
 					}
-					fci := api.SubCmdIdx{uint64(id), uint64(i), uint64(j), uint64(k)}
-					submittedCmd := newSubmittedCommand(fci, cbc, nil)
-					vb.submitInfos[id].pendingCommands = append(vb.submitInfos[id].pendingCommands, submittedCmd)
 				}
 			}
 			waitSemaphoreCount := uint64(submit.WaitSemaphoreCount)

diff --git a/gapis/api/vulkan/vulkan.api b/gapis/api/vulkan/vulkan.api
@@ -2814,7 +2814,7 @@ cmd VkResult vkQueueSubmit(
         ref := cb.CommandReferences[as!u32(k)]
         if ref.Type == cmd_vkCmdExecuteCommands {
           enterSubcontext()
-          ec := cb.BufferCommands.vkCmdExecuteCommands[ref.CommandIndex]
+          ec := cb.BufferCommands.vkCmdExecuteCommands[ref.MapIndex]
           for l in (0 .. len(ec.CommandBuffers)) {
             scb := CommandBuffers[ec.CommandBuffers[as!u32(l)]]
             enterSubcontext()