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

Fix occasional crash when swizzling used but shader swizzling not enabled.

Browse Source 
MVKImageViewPlane distinguish tracking of native and shader swizzling.
Only provide packed swizzle value if shader swizzling is used.
This commit is contained in:
Bill Hollings 2021-07-08 16:43:22 -04:00
parent bde3a86180
commit c2f27e40c1
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MoltenVK/MoltenVK/API/vk_mvk_moltenvk.h
View File

@ -423,7 +423,7 @@ typedef struct {
* a very limited set of VkImageView component swizzles are supported via format substitutions. * a very limited set of VkImageView component swizzles are supported via format substitutions.
* *
* If Metal supports native per-texture swizzling, this parameter is ignored. * If Metal supports native per-texture swizzling, this parameter is ignored.
*
* When running on an older version of Metal that does not support native per-texture * When running on an older version of Metal that does not support native per-texture
* swizzling, if this parameter is enabled, both when a VkImageView is created, and * swizzling, if this parameter is enabled, both when a VkImageView is created, and
* when any pipeline that uses that VkImageView is compiled, VkImageView swizzling is * when any pipeline that uses that VkImageView is compiled, VkImageView swizzling is

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

@ -532,7 +532,7 @@ public:
void releaseMTLTexture(); void releaseMTLTexture();
/** Returns the packed component swizzle of this image view. */ /** Returns the packed component swizzle of this image view. */
uint32_t getPackedSwizzle() { return _useSwizzle ? mvkPackSwizzle(_componentSwizzle) : 0; } uint32_t getPackedSwizzle() { return _useShaderSwizzle ? mvkPackSwizzle(_componentSwizzle) : 0; }
~MVKImageViewPlane(); ~MVKImageViewPlane();
@ -541,6 +541,7 @@ protected:
id<MTLTexture> newMTLTexture(); id<MTLTexture> newMTLTexture();
id<MTLTexture> getUnswizzledMTLTexture(); id<MTLTexture> getUnswizzledMTLTexture();
VkResult initSwizzledMTLPixelFormat(const VkImageViewCreateInfo* pCreateInfo); VkResult initSwizzledMTLPixelFormat(const VkImageViewCreateInfo* pCreateInfo);
bool enableSwizzling();
MVKImageViewPlane(MVKImageView* imageView, uint8_t planeIndex, MTLPixelFormat mtlPixFmt, const VkImageViewCreateInfo* pCreateInfo); MVKImageViewPlane(MVKImageView* imageView, uint8_t planeIndex, MTLPixelFormat mtlPixFmt, const VkImageViewCreateInfo* pCreateInfo);
friend MVKImageView; friend MVKImageView;
@ -550,7 +551,8 @@ protected:
MTLPixelFormat _mtlPixFmt; MTLPixelFormat _mtlPixFmt;
uint8_t _planeIndex; uint8_t _planeIndex;
bool _useMTLTextureView; bool _useMTLTextureView;
bool _useSwizzle; bool _useNativeSwizzle;
bool _useShaderSwizzle;
}; };

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

@ -1448,7 +1448,7 @@ id<MTLTexture> MVKImageViewPlane::newMTLTexture() {
sliceRange = NSMakeRange(0, 1); sliceRange = NSMakeRange(0, 1);
} }
id<MTLTexture> mtlTex = _imageView->_image->getMTLTexture(_planeIndex); id<MTLTexture> mtlTex = _imageView->_image->getMTLTexture(_planeIndex);
if (_device->_pMetalFeatures->nativeTextureSwizzle && _useSwizzle) { if (_useNativeSwizzle) {
return [mtlTex newTextureViewWithPixelFormat: _mtlPixFmt return [mtlTex newTextureViewWithPixelFormat: _mtlPixFmt
textureType: mtlTextureType textureType: mtlTextureType
levels: NSMakeRange(_imageView->_subresourceRange.baseMipLevel, _imageView->_subresourceRange.levelCount) levels: NSMakeRange(_imageView->_subresourceRange.baseMipLevel, _imageView->_subresourceRange.levelCount)
@ -1466,7 +1466,7 @@ id<MTLTexture> MVKImageViewPlane::newMTLTexture() {
// This is relevant for depth/stencil attachments that are also sampled and might have forced swizzles. // This is relevant for depth/stencil attachments that are also sampled and might have forced swizzles.
id<MTLTexture> MVKImageViewPlane::getUnswizzledMTLTexture() { id<MTLTexture> MVKImageViewPlane::getUnswizzledMTLTexture() {
id<MTLTexture> mtlTex = getMTLTexture(); id<MTLTexture> mtlTex = getMTLTexture();
return _useSwizzle && mtlTex.parentTexture ? mtlTex.parentTexture : mtlTex; return _useNativeSwizzle && mtlTex.parentTexture ? mtlTex.parentTexture : mtlTex;
} }
@ -1494,7 +1494,7 @@ MVKImageViewPlane::MVKImageViewPlane(MVKImageView* imageView,
((_imageView->_mtlTextureType == MTLTextureType2D || _imageView->_mtlTextureType == MTLTextureType2DArray) && is3D)) && ((_imageView->_mtlTextureType == MTLTextureType2D || _imageView->_mtlTextureType == MTLTextureType2DArray) && is3D)) &&
_imageView->_subresourceRange.levelCount == _imageView->_image->_mipLevels && _imageView->_subresourceRange.levelCount == _imageView->_image->_mipLevels &&
(is3D || _imageView->_subresourceRange.layerCount == _imageView->_image->_arrayLayers) && (is3D || _imageView->_subresourceRange.layerCount == _imageView->_image->_arrayLayers) &&
!_useSwizzle) { !_useNativeSwizzle) {
_useMTLTextureView = false; _useMTLTextureView = false;
} }
} else { } else {
@ -1504,11 +1504,10 @@ MVKImageViewPlane::MVKImageViewPlane(MVKImageView* imageView,
VkResult MVKImageViewPlane::initSwizzledMTLPixelFormat(const VkImageViewCreateInfo* pCreateInfo) { VkResult MVKImageViewPlane::initSwizzledMTLPixelFormat(const VkImageViewCreateInfo* pCreateInfo) {
_useSwizzle = false; _useNativeSwizzle = false;
_useShaderSwizzle = false;
_componentSwizzle = pCreateInfo->components; _componentSwizzle = pCreateInfo->components;
VkImageAspectFlags aspectMask = pCreateInfo->subresourceRange.aspectMask; VkImageAspectFlags aspectMask = pCreateInfo->subresourceRange.aspectMask;
bool supportsSwizzling = _device->_pMetalFeatures->nativeTextureSwizzle || mvkConfig().fullImageViewSwizzle;
#define SWIZZLE_MATCHES(R, G, B, A) mvkVkComponentMappingsMatch(_componentSwizzle, {VK_COMPONENT_SWIZZLE_ ##R, VK_COMPONENT_SWIZZLE_ ##G, VK_COMPONENT_SWIZZLE_ ##B, VK_COMPONENT_SWIZZLE_ ##A} ) #define SWIZZLE_MATCHES(R, G, B, A) mvkVkComponentMappingsMatch(_componentSwizzle, {VK_COMPONENT_SWIZZLE_ ##R, VK_COMPONENT_SWIZZLE_ ##G, VK_COMPONENT_SWIZZLE_ ##B, VK_COMPONENT_SWIZZLE_ ##A} )
#define VK_COMPONENT_SWIZZLE_ANY VK_COMPONENT_SWIZZLE_MAX_ENUM #define VK_COMPONENT_SWIZZLE_ANY VK_COMPONENT_SWIZZLE_MAX_ENUM
@ -1534,9 +1533,8 @@ VkResult MVKImageViewPlane::initSwizzledMTLPixelFormat(const VkImageViewCreateIn
// When reading or sampling into a vec4 color, Vulkan expects the depth or stencil value in only the red component. // When reading or sampling into a vec4 color, Vulkan expects the depth or stencil value in only the red component.
// Metal can be inconsistent, but on most platforms populates all components with the depth or stencil value. // Metal can be inconsistent, but on most platforms populates all components with the depth or stencil value.
// If swizzling is available, we can compensate for this by forcing the appropriate swizzle. // If swizzling is available, we can compensate for this by forcing the appropriate swizzle.
if (supportsSwizzling && mvkIsAnyFlagEnabled(aspectMask, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { if (mvkIsAnyFlagEnabled(aspectMask, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT) && enableSwizzling()) {
_componentSwizzle = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_ZERO, VK_COMPONENT_SWIZZLE_ZERO, VK_COMPONENT_SWIZZLE_ONE }; _componentSwizzle = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_ZERO, VK_COMPONENT_SWIZZLE_ZERO, VK_COMPONENT_SWIZZLE_ONE };
_useSwizzle = true;
} }
} }
@ -1672,8 +1670,8 @@ VkResult MVKImageViewPlane::initSwizzledMTLPixelFormat(const VkImageViewCreateIn
break; break;
} }
// No format transformation swizzles were found, so we'll need to use either native or shader swizzling, if it is supported. // No format transformation swizzles were found, so we'll need to use either native or shader swizzling, if supported.
if ( !supportsSwizzling ) { if ( !enableSwizzling() ) {
return getVulkanAPIObject()->reportError(VK_ERROR_FEATURE_NOT_PRESENT, return getVulkanAPIObject()->reportError(VK_ERROR_FEATURE_NOT_PRESENT,
"The value of %s::components) (%s, %s, %s, %s), when applied to a VkImageView, requires full component swizzling to be enabled both at the" "The value of %s::components) (%s, %s, %s, %s), when applied to a VkImageView, requires full component swizzling to be enabled both at the"
" time when the VkImageView is created and at the time any pipeline that uses that VkImageView is compiled. Full component swizzling can" " time when the VkImageView is created and at the time any pipeline that uses that VkImageView is compiled. Full component swizzling can"
@ -1683,11 +1681,16 @@ VkResult MVKImageViewPlane::initSwizzledMTLPixelFormat(const VkImageViewCreateIn
mvkVkComponentSwizzleName(_componentSwizzle.b), mvkVkComponentSwizzleName(_componentSwizzle.a)); mvkVkComponentSwizzleName(_componentSwizzle.b), mvkVkComponentSwizzleName(_componentSwizzle.a));
} }
_useSwizzle = true;
return VK_SUCCESS; return VK_SUCCESS;
} }
// Enable either native or shader swizzling, depending on what is available, preferring native, and return whether successful.
bool MVKImageViewPlane::enableSwizzling() {
_useNativeSwizzle = _device->_pMetalFeatures->nativeTextureSwizzle;
_useShaderSwizzle = !_useNativeSwizzle && mvkConfig().fullImageViewSwizzle;
return _useNativeSwizzle || _useShaderSwizzle;
}
MVKImageViewPlane::~MVKImageViewPlane() { MVKImageViewPlane::~MVKImageViewPlane() {
[_mtlTexture release]; [_mtlTexture release];
} }