Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1458 from js6i/master

Browse Source 
MVKImage: Select proper base layer and mipmap for attachment if not using view because of swizzling.
This commit is contained in:
Bill Hollings 2021-10-26 11:05:09 -04:00 committed by GitHub
commit de201b4b9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MoltenVK/MoltenVK/GPUObjects/MVKImage.h
View File

@ -530,7 +530,6 @@ public:
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);

35
MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
View File

@ -1449,13 +1449,6 @@ id<MTLTexture> MVKImageViewPlane::newMTLTexture() {
}
}
// 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::propagateDebugName() {
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;
}
}