Vulkan: Fix crash at VkDestroyDebugReportCallbackEXT (#1998)

If the application uses debug report callback, we should not use our synthetic commands to process their callback handles.
google · Jun 20, 2018 · e5b2d6b · e5b2d6b
1 parent ea00362
commit e5b2d6b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/gapis/api/vulkan/find_issues.go b/gapis/api/vulkan/find_issues.go
@@ -72,8 +72,9 @@ type findIssues struct {
 
 func newFindIssues(ctx context.Context, c *capture.Capture, numInitialCmds int) *findIssues {
 	t := &findIssues{
-		state:          c.NewState(ctx),
-		numInitialCmds: numInitialCmds,
+		state:           c.NewState(ctx),
+		numInitialCmds:  numInitialCmds,
+		reportCallbacks: map[VkInstance]VkDebugReportCallbackEXT{},
 	}
 	t.state.OnError = func(err interface{}) {
 		if issue, ok := err.(replay.Issue); ok {
@@ -116,6 +117,7 @@ func (t *findIssues) Transform(ctx context.Context, id api.CmdID, cmd api.Cmd, o
 		inst := di.Instance()
 		if ch, ok := t.reportCallbacks[inst]; ok {
 			out.MutateAndWrite(ctx, api.CmdNoID, cb.ReplayDestroyVkDebugReportCallback(inst, ch))
+			delete(t.reportCallbacks, inst)
 		}
 	}
 
@@ -262,11 +264,17 @@ func (t *findIssues) Transform(ctx context.Context, id api.CmdID, cmd api.Cmd, o
 		).AddWrite(
 			callbackHandleData.Data(),
 		))
+		t.reportCallbacks[inst] = callbackHandle
 	}
 }
 
 func (t *findIssues) Flush(ctx context.Context, out transform.Writer) {
 	cb := CommandBuilder{Thread: 0, Arena: t.state.Arena}
+	for inst, ch := range t.reportCallbacks {
+		out.MutateAndWrite(ctx, api.CmdNoID, cb.ReplayDestroyVkDebugReportCallback(inst, ch))
+		// It is safe to delete keys in loop in Go
+		delete(t.reportCallbacks, inst)
+	}
 	out.MutateAndWrite(ctx, api.CmdNoID, cb.Custom(func(ctx context.Context, s *api.GlobalState, b *builder.Builder) error {
 		b.RegisterNotificationReader(func(n gapir.Notification) {
 			vkApi := API{}

diff --git a/gapis/api/vulkan/replay.go b/gapis/api/vulkan/replay.go
@@ -431,7 +431,7 @@ func (t *destroyResourcesAtEOS) Flush(ctx context.Context, out transform.Writer)
 
 	// Debug report callbacks
 	for handle, object := range so.DebugReportCallbacks().All() {
-		out.MutateAndWrite(ctx, id, cb.ReplayDestroyVkDebugReportCallback(object.Instance(), handle))
+		out.MutateAndWrite(ctx, id, cb.VkDestroyDebugReportCallbackEXT(object.Instance(), handle, p))
 	}
 
 	// Instances.

diff --git a/gapis/api/vulkan/synthetic.api b/gapis/api/vulkan/synthetic.api
@@ -209,16 +209,10 @@ cmd bool ReplayCreateVkDebugReportCallback(
   VkDebugReportCallbackEXT* pCallback) {
   if !(instance in Instances) { vkErrorInvalidInstance(instance) }
   if pCreateInfo == null { vkErrorNullPointer("VkDebugReportCallbackCreateInfoEXT") }
-  info := pCreateInfo[0]
+  read(pCreateInfo[0:1])
   handle := ?
   if pCallback == null { vkErrorNullPointer("VkDebugReportCallbackEXT") }
   pCallback[0] = handle
-  object := new!DebugReportCallbackObject(
-    Instance:     instance,
-    Flags:        info.flags,
-    VulkanHandle: handle,
-  )
-  DebugReportCallbacks[handle] = object
   return ?
 }
 
@@ -227,7 +221,4 @@ cmd void ReplayDestroyVkDebugReportCallback(
   VkInstance instance,
   VkDebugReportCallbackEXT callback) {
   if !(instance in Instances) { vkErrorInvalidInstance(instance) }
-  if (callback != as!VkDebugReportCallbackEXT(0)) {
-    delete(DebugReportCallbacks, callback)
-  }
 }