Skip tracking the data dependency of destroyed framebuffer images (#1657

) * Skip tracking the data dependency of destroyed framebuffer images * invalidate the image view and image in the api file * also invalidate the image info in the descriptor sets
google · Mar 1, 2018 · 0702cf7 · 0702cf7
1 parent 87695fe
commit 0702cf7
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/gapis/api/vulkan/footprint_builder.go b/gapis/api/vulkan/footprint_builder.go
@@ -1211,8 +1211,12 @@ type FootprintBuilder struct {
 func (vb *FootprintBuilder) getImageData(ctx context.Context,
 	bh *dependencygraph.Behavior, vkImg VkImage) []dependencygraph.DefUseVariable {
 	if bh != nil {
-		read(ctx, bh, vkHandle(vkImg))
-		read(ctx, bh, vb.images[vkImg].layout)
+		if !read(ctx, bh, vkHandle(vkImg)) {
+			return []dependencygraph.DefUseVariable{}
+		}
+		if !read(ctx, bh, vb.images[vkImg].layout) {
+			return []dependencygraph.DefUseVariable{}
+		}
 	}
 	data := vb.images[vkImg].opaqueData.getBoundData(ctx, bh, 0, vkWholeSize)
 	for _, aspecti := range vb.images[vkImg].sparseData {
@@ -1643,6 +1647,9 @@ func (vb *FootprintBuilder) BuildFootprint(ctx context.Context,
 				lastDrawInfo := GetState(s).LastDrawInfos.Get(lastBoundQueue.VulkanHandle)
 				if lastDrawInfo.Framebuffer != nil {
 					for _, view := range lastDrawInfo.Framebuffer.ImageAttachments.Range() {
+						if view == nil || view.Image == nil {
+							continue
+						}
 						img := view.Image
 						data := vb.getImageData(ctx, nil, img.VulkanHandle)
 						vb.machine.lastBoundFramebufferImageData[id] = append(

diff --git a/gapis/api/vulkan/vulkan.api b/gapis/api/vulkan/vulkan.api
@@ -4166,6 +4166,11 @@ cmd void vkDestroyImage(
       delete(imageObject.BoundMemory.BoundObjects, as!u64(image))
     }
     delete(Images, image)
+    for _, _, v in ImageViews {
+      if v.Image.VulkanHandle == image {
+        v.Image = null
+      }
+    }
   }
 
 }
@@ -4221,6 +4226,22 @@ cmd void vkDestroyImageView(
   // TODO: pAllocator
   if !(device in Devices) { vkErrorInvalidDevice(device) }
   delete(ImageViews, imageView)
+  for _, _, drawInfo in LastDrawInfos {
+    for _, i, v in drawInfo.Framebuffer.ImageAttachments {
+      if (v != null) && (v.VulkanHandle == imageView) {
+        drawInfo.Framebuffer.ImageAttachments[i] = null
+      }
+    }
+  }
+  for _, _, descSet in DescriptorSets {
+    for _, _, binding in descSet.Bindings {
+      for _, _, imgBinding in binding.ImageBinding {
+        if imgBinding.ImageView == imageView {
+          imgBinding.ImageView = as!VkImageView(0)
+        }
+      }
+    }
+  }
 }
 
 @indirect("VkDevice")