commit de201b4b9f91c1fdac01164035a94d46af190563
author Bill Hollings <bill.hollings@brenwill.com> Tue Oct 26 11:05:09 2021 -0400
committer GitHub <noreply@github.com> Tue Oct 26 11:05:09 2021 -0400
tree c7d3dc1298648f7c0c2fe4ff563b72a541a22e5c
parent b9863dfd78f3761f5a8dd5bd9b8b1f5fc4c5089f
parent 99dcaaa070f7326461cb7a5158577d043d422b0e

Merge pull request #1458 from js6i/master

MVKImage: Select proper base layer and mipmap for attachment if not using view because of swizzling.

MoltenVK/MoltenVK/GPUObjects/MVKImage.h

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKImage.h b/MoltenVK/MoltenVK/GPUObjects/MVKImage.h
index c649069..1914da7 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKImage.h
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKImage.h
@@ -530,7 +530,6 @@
 protected:
     void propagateDebugName();
     id<MTLTexture> newMTLTexture();
-	id<MTLTexture> getUnswizzledMTLTexture();
 	VkResult initSwizzledMTLPixelFormat(const VkImageViewCreateInfo* pCreateInfo);
 	bool enableSwizzling();
     MVKImageViewPlane(MVKImageView* imageView, uint8_t planeIndex, MTLPixelFormat mtlPixFmt, const VkImageViewCreateInfo* pCreateInfo);

MoltenVK/MoltenVK/GPUObjects/MVKImage.mm

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
index 37a92e7..854ea5a 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
@@ -1449,13 +1449,6 @@
     }
 }
 
-// If a swizzle is being applied, returns the unswizzled parent texture.
-// This is relevant for depth/stencil attachments that are also sampled and might have forced swizzles.
-id<MTLTexture> MVKImageViewPlane::getUnswizzledMTLTexture() {
-	id<MTLTexture> mtlTex = getMTLTexture();
-	return _useNativeSwizzle && mtlTex.parentTexture ? mtlTex.parentTexture : mtlTex;
-}
-
 
 #pragma mark Construction
 
@@ -1694,26 +1687,40 @@
 
 void MVKImageView::populateMTLRenderPassAttachmentDescriptor(MTLRenderPassAttachmentDescriptor* mtlAttDesc) {
     MVKImageViewPlane* plane = _planes[0];
-    mtlAttDesc.texture = plane->getUnswizzledMTLTexture();
-    mtlAttDesc.level = plane->_useMTLTextureView ? 0 : _subresourceRange.baseMipLevel;
+    bool useView = plane->_useMTLTextureView;
+    mtlAttDesc.texture = plane->getMTLTexture();
+    // If a native swizzle is being applied, use the unswizzled parent texture.
+    // This is relevant for depth/stencil attachments that are also sampled and might have forced swizzles.
+    if (plane->_useNativeSwizzle && mtlAttDesc.texture.parentTexture) {
+        useView = false;
+        mtlAttDesc.texture = mtlAttDesc.texture.parentTexture;
+    }
+    mtlAttDesc.level = useView ? 0 : _subresourceRange.baseMipLevel;
     if (mtlAttDesc.texture.textureType == MTLTextureType3D) {
         mtlAttDesc.slice = 0;
         mtlAttDesc.depthPlane = _subresourceRange.baseArrayLayer;
     } else {
-        mtlAttDesc.slice = plane->_useMTLTextureView ? 0 : _subresourceRange.baseArrayLayer;
+        mtlAttDesc.slice = useView ? 0 : _subresourceRange.baseArrayLayer;
         mtlAttDesc.depthPlane = 0;
     }
 }
 
 void MVKImageView::populateMTLRenderPassAttachmentDescriptorResolve(MTLRenderPassAttachmentDescriptor* mtlAttDesc) {
     MVKImageViewPlane* plane = _planes[0];
-    mtlAttDesc.resolveTexture = plane->getUnswizzledMTLTexture();
-    mtlAttDesc.resolveLevel = plane->_useMTLTextureView ? 0 : _subresourceRange.baseMipLevel;
+    bool useView = plane->_useMTLTextureView;
+    mtlAttDesc.resolveTexture = plane->getMTLTexture();
+    // If a native swizzle is being applied, use the unswizzled parent texture.
+    // This is relevant for depth/stencil attachments that are also sampled and might have forced swizzles.
+    if (plane->_useNativeSwizzle && mtlAttDesc.resolveTexture.parentTexture) {
+        useView = false;
+        mtlAttDesc.resolveTexture = mtlAttDesc.resolveTexture.parentTexture;
+    }
+    mtlAttDesc.resolveLevel = useView ? 0 : _subresourceRange.baseMipLevel;
     if (mtlAttDesc.resolveTexture.textureType == MTLTextureType3D) {
         mtlAttDesc.resolveSlice = 0;
-        mtlAttDesc.resolveDepthPlane = plane->_useMTLTextureView ? 0 : _subresourceRange.baseArrayLayer;
+        mtlAttDesc.resolveDepthPlane = useView ? 0 : _subresourceRange.baseArrayLayer;
     } else {
-        mtlAttDesc.resolveSlice = plane->_useMTLTextureView ? 0 : _subresourceRange.baseArrayLayer;
+        mtlAttDesc.resolveSlice = useView ? 0 : _subresourceRange.baseArrayLayer;
         mtlAttDesc.resolveDepthPlane = 0;
     }
 }