Vulkan: Fix some image layout errors reported by validation layers (#…

…2353)
google · Nov 8, 2018 · 9acb3d6 · 9acb3d6
1 parent feb3e1e
commit 9acb3d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/gapis/api/vulkan/image_primer.go b/gapis/api/vulkan/image_primer.go
@@ -112,10 +112,7 @@ func (p *imagePrimer) primeByRendering(img ImageObjectʳ, opaqueBoundRanges []Vk
 				inputImageObjects := copyJob.srcAspectsToDsts[aspect].dstImgs
 				inputImages := make([]ipRenderImage, len(inputImageObjects))
 				for i, iimg := range inputImageObjects {
-					layout := iimg.Aspects().Get(
-						VkImageAspectFlagBits_VK_IMAGE_ASPECT_COLOR_BIT).Layers().Get(
-						layer).Levels().Get(
-						level).Layout()
+					layout := copyJob.finalLayout.layoutOf(VkImageAspectFlagBits_VK_IMAGE_ASPECT_COLOR_BIT, layer, level)
 					inputImages[i] = ipRenderImage{
 						image:         iimg,
 						aspect:        VkImageAspectFlagBits_VK_IMAGE_ASPECT_COLOR_BIT,
@@ -211,7 +208,7 @@ func (p *imagePrimer) primeByImageStore(img ImageObjectʳ, opaqueBoundRanges []V
 			oldQueue:       queue.VulkanHandle(),
 			newQueue:       queue.VulkanHandle(),
 		})
-		oldLayouts = append(oldLayouts, l.Layout())
+		oldLayouts = append(oldLayouts, img.Aspects().Get(aspect).Layers().Get(layer).Levels().Get(level).Layout())
 	})
 	p.sb.changeImageSubRangeLayoutAndOwnership(img.VulkanHandle(), transitionInfo)
 

diff --git a/gapis/api/vulkan/state_rebuilder.go b/gapis/api/vulkan/state_rebuilder.go
@@ -1717,7 +1717,7 @@ func (sb *stateBuilder) createImage(img ImageObjectʳ, imgPrimer *imagePrimer) {
 					oldQueue = sparseQueue.VulkanHandle()
 				}
 				transitionInfo = append(transitionInfo, imageSubRangeInfo{
-					aspectMask:     VkImageAspectFlags(aspect),
+					aspectMask:     ipImageBarrierAspectFlags(aspect, img.Info().Fmt()),
 					baseMipLevel:   level,
 					levelCount:     1,
 					baseArrayLayer: layer,
@@ -1729,7 +1729,7 @@ func (sb *stateBuilder) createImage(img ImageObjectʳ, imgPrimer *imagePrimer) {
 				})
 				if q.Family() != imgLevel.LastBoundQueue().Family() {
 					ownerTransferInfo = append(ownerTransferInfo, imageSubRangeInfo{
-						aspectMask:     VkImageAspectFlags(aspect),
+						aspectMask:     ipImageBarrierAspectFlags(aspect, img.Info().Fmt()),
 						baseMipLevel:   level,
 						levelCount:     1,
 						baseArrayLayer: layer,