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

Use unswizzled MTLTexture for attachments.

Browse Source 
Depth/stencil attachments that are also sampled might have an artificially forced
swizzled texture view. The original unswizzled texture must be used for attachments.
Add MVKImageViewPlane::getUnswizzledMTLTexture().
This commit is contained in:
Bill Hollings 2021-07-07 13:09:40 -04:00
parent 53a2223abd
commit e482ac95df
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -539,6 +539,7 @@ public:
protected:
void propagateDebugName();
id<MTLTexture> newMTLTexture();
id<MTLTexture> getUnswizzledMTLTexture();
VkResult initSwizzledMTLPixelFormat(const VkImageViewCreateInfo* pCreateInfo);
MVKImageViewPlane(MVKImageView* imageView, uint8_t planeIndex, MTLPixelFormat mtlPixFmt, const VkImageViewCreateInfo* pCreateInfo);

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

@ -1462,6 +1462,13 @@ 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 _useSwizzle && mtlTex.parentTexture ? mtlTex.parentTexture : mtlTex;
}
#pragma mark Construction
@ -1487,7 +1494,7 @@ MVKImageViewPlane::MVKImageViewPlane(MVKImageView* imageView,
((_imageView->_mtlTextureType == MTLTextureType2D || _imageView->_mtlTextureType == MTLTextureType2DArray) && is3D)) &&
_imageView->_subresourceRange.levelCount == _imageView->_image->_mipLevels &&
(is3D || _imageView->_subresourceRange.layerCount == _imageView->_image->_arrayLayers) &&
(!_device->_pMetalFeatures->nativeTextureSwizzle || !_useSwizzle)) {
!_useSwizzle) {
_useMTLTextureView = false;
}
} else {
@ -1697,7 +1704,7 @@ void MVKImageView::propagateDebugName() {
void MVKImageView::populateMTLRenderPassAttachmentDescriptor(MTLRenderPassAttachmentDescriptor* mtlAttDesc) {
MVKImageViewPlane* plane = _planes[0];
mtlAttDesc.texture = plane->getMTLTexture(); // Use image view, necessary if image view format differs from image format
mtlAttDesc.texture = plane->getUnswizzledMTLTexture();
mtlAttDesc.level = plane->_useMTLTextureView ? 0 : _subresourceRange.baseMipLevel;
if (mtlAttDesc.texture.textureType == MTLTextureType3D) {
mtlAttDesc.slice = 0;
@ -1710,7 +1717,7 @@ void MVKImageView::populateMTLRenderPassAttachmentDescriptor(MTLRenderPassAttach
void MVKImageView::populateMTLRenderPassAttachmentDescriptorResolve(MTLRenderPassAttachmentDescriptor* mtlAttDesc) {
MVKImageViewPlane* plane = _planes[0];
mtlAttDesc.resolveTexture = plane->getMTLTexture(); // Use image view, necessary if image view format differs from image format
mtlAttDesc.resolveTexture = plane->getUnswizzledMTLTexture();
mtlAttDesc.resolveLevel = plane->_useMTLTextureView ? 0 : _subresourceRange.baseMipLevel;
if (mtlAttDesc.resolveTexture.textureType == MTLTextureType3D) {
mtlAttDesc.resolveSlice = 0;