From 70d94d2967f1dd6a84cb721780d542ed5b071d15 Mon Sep 17 00:00:00 2001 From: Andrew Woloszyn Date: Thu, 12 Oct 2017 13:22:33 -0400 Subject: [PATCH] Fix for VkSetEvent We were clobbering over a pointer incorrectly, this was causing the synchronization data to be created incorrectly. --- gapis/api/vulkan/buffer_command.go | 4 +- gapis/api/vulkan/externs.go | 96 +++++++++++++-------------- gapis/api/vulkan/footprint_builder.go | 6 +- gapis/api/vulkan/vulkan.go | 14 ++-- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/gapis/api/vulkan/buffer_command.go b/gapis/api/vulkan/buffer_command.go index 3ca329770f..d4cb4b6cf6 100644 --- a/gapis/api/vulkan/buffer_command.go +++ b/gapis/api/vulkan/buffer_command.go @@ -28,8 +28,8 @@ type CommandBufferCommand struct { } type QueuedCommand struct { - initialCall *api.Cmd - submit *api.Cmd + initialCall api.Cmd + submit api.Cmd submissionIndex []uint64 actualSubmission bool } diff --git a/gapis/api/vulkan/externs.go b/gapis/api/vulkan/externs.go index dcdad0d962..34296a228c 100644 --- a/gapis/api/vulkan/externs.go +++ b/gapis/api/vulkan/externs.go @@ -91,7 +91,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -107,7 +107,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -123,7 +123,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -139,7 +139,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -155,7 +155,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -171,7 +171,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -187,7 +187,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -203,7 +203,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -219,7 +219,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -235,7 +235,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -251,7 +251,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -267,7 +267,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -283,7 +283,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -299,7 +299,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -315,7 +315,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -331,7 +331,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -347,7 +347,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -363,7 +363,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -379,7 +379,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -395,7 +395,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -411,7 +411,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -427,7 +427,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -443,7 +443,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -459,7 +459,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -475,7 +475,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -491,7 +491,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -507,7 +507,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -523,7 +523,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -539,7 +539,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -555,7 +555,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -571,7 +571,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -587,7 +587,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -603,7 +603,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -619,7 +619,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -635,7 +635,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -651,7 +651,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -667,7 +667,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -683,7 +683,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -699,7 +699,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -715,7 +715,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -731,7 +731,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -747,7 +747,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -763,7 +763,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -779,7 +779,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -795,7 +795,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -811,7 +811,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -827,7 +827,7 @@ func (e externs) addCmd(commandBuffer VkCommandBuffer, data interface{}, functio SemaphoreUpdate: SemaphoreUpdate_None, Semaphore: VkSemaphore(0), QueuedCommandData: QueuedCommand{ - initialCall: &e.cmd, + initialCall: e.cmd, submit: nil, submissionIndex: []uint64(nil), actualSubmission: true, @@ -858,7 +858,7 @@ func (e externs) notifyPendingCommandAdded(queue VkQueue) { queueObject := s.Queues[queue] command := queueObject.PendingCommands[uint32(len(queueObject.PendingCommands)-1)] s.SubCmdIdx[len(s.SubCmdIdx)-1] = uint64(command.CommandIndex) - command.QueuedCommandData.submit = &e.cmd + command.QueuedCommandData.submit = e.cmd command.QueuedCommandData.submissionIndex = append([]uint64(nil), s.SubCmdIdx...) command.QueuedCommandData.actualSubmission = true queueObject.PendingCommands[uint32(len(queueObject.PendingCommands)-1)] = command diff --git a/gapis/api/vulkan/footprint_builder.go b/gapis/api/vulkan/footprint_builder.go index 110b3fd4e3..8b7938295e 100644 --- a/gapis/api/vulkan/footprint_builder.go +++ b/gapis/api/vulkan/footprint_builder.go @@ -1254,7 +1254,7 @@ func (vb *FootprintBuilder) BuildFootprint(ctx context.Context, // commandbuffer commands. executedCommands := []api.SubCmdIdx{} GetState(s).PostSubcommand = func(a interface{}) { - queueSubmit, isQs := (*GetState(s).CurrentSubmission).(*VkQueueSubmit) + queueSubmit, isQs := (GetState(s).CurrentSubmission).(*VkQueueSubmit) if !isQs { log.E(ctx, "CurrentSubmission command in State is not a VkQueueSubmit") } @@ -1378,11 +1378,11 @@ func (vb *FootprintBuilder) BuildFootprint(ctx context.Context, case *VkCreateImageView: write(ctx, bh, vkHandle(cmd.PView.MustRead(ctx, cmd, s, nil))) - img := cmd.PCreateInfo.MustRead(ctx, cmd, s, nil).Image + img := cmd.PCreateInfo.MustRead(ctx, cmd, s, nil).Image read(ctx, bh, vb.getImageData(ctx, bh, img)) case *RecreateImageView: write(ctx, bh, vkHandle(cmd.PImageView.MustRead(ctx, cmd, s, nil))) - img := cmd.PCreateInfo.MustRead(ctx, cmd, s, nil).Image + img := cmd.PCreateInfo.MustRead(ctx, cmd, s, nil).Image read(ctx, bh, vb.getImageData(ctx, bh, img)) case *VkDestroyImageView: read(ctx, bh, vkHandle(cmd.ImageView)) diff --git a/gapis/api/vulkan/vulkan.go b/gapis/api/vulkan/vulkan.go index 582519850d..71faf61061 100644 --- a/gapis/api/vulkan/vulkan.go +++ b/gapis/api/vulkan/vulkan.go @@ -31,7 +31,7 @@ import ( type CustomState struct { SubCmdIdx api.SubCmdIdx - CurrentSubmission *api.Cmd + CurrentSubmission api.Cmd PreSubcommand func(interface{}) PostSubcommand func(interface{}) AddCommand func(interface{}) @@ -140,8 +140,8 @@ func (API) ResolveSynchronization(ctx context.Context, d *sync.Data, c *path.Cap s := GetState(st) i := api.CmdID(0) - submissionMap := make(map[*api.Cmd]api.CmdID) - commandMap := make(map[*api.Cmd]api.CmdID) + submissionMap := make(map[api.Cmd]api.CmdID) + commandMap := make(map[api.Cmd]api.CmdID) lastSubcommand := api.SubCmdIdx{} lastCmdIndex := api.CmdID(0) @@ -151,7 +151,7 @@ func (API) ResolveSynchronization(ctx context.Context, d *sync.Data, c *path.Cap // Stacks of markers to be opened in the next subcommand for each VkQueue markersToOpen := map[VkQueue][]*markerInfo{} s.pushMarkerGroup = func(name string, next bool, ty MarkerType) { - vkQu := (*s.CurrentSubmission).(*VkQueueSubmit).Queue + vkQu := (s.CurrentSubmission).(*VkQueueSubmit).Queue if next { // Add to the to-open marker stack, marker will be opened in the next // subcommand @@ -171,7 +171,7 @@ func (API) ResolveSynchronization(ctx context.Context, d *sync.Data, c *path.Cap } } s.popMarkerGroup = func(ty MarkerType) { - vkQu := (*s.CurrentSubmission).(*VkQueueSubmit).Queue + vkQu := (s.CurrentSubmission).(*VkQueueSubmit).Queue stack := markerStack[vkQu] if len(stack) == 0 { log.W(ctx, "Cannot pop marker with type: %v, no open marker with same type at: VkQueueSubmit ID: %v, SubCmdIdx: %v", @@ -224,7 +224,7 @@ func (API) ResolveSynchronization(ctx context.Context, d *sync.Data, c *path.Cap // Finally, no matter whether the comming subcommand is in a different // command buffer or submission batch, If there are pending markers in the // to-open stack, begin new groups for those pending markers. - vkQu := (*s.CurrentSubmission).(*VkQueueSubmit).Queue + vkQu := (s.CurrentSubmission).(*VkQueueSubmit).Queue stack := markerStack[vkQu] fullCmdIdx := api.SubCmdIdx{uint64(submissionMap[s.CurrentSubmission])} fullCmdIdx = append(fullCmdIdx, s.SubCmdIdx...) @@ -321,7 +321,7 @@ func (API) ResolveSynchronization(ctx context.Context, d *sync.Data, c *path.Cap } // Update the End value for all unclosed debug marker groups - vkQu := (*s.CurrentSubmission).(*VkQueueSubmit).Queue + vkQu := (s.CurrentSubmission).(*VkQueueSubmit).Queue for _, ms := range markerStack[vkQu] { // If the last subcommand is in a secondary command buffer and current // recording debug marker groups are opened in a primary command buffer,