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

Disable the variableMultisampleRate feature for now.

Browse Source 
We actually can't support this. Metal's validation layer complains if
a pipeline has a different raster sample count from that of the
framebuffer, even in the no-attachment case. This means that the
`defaultRasterSampleCount` property must be set correctly if Metal
supports no-attachment rendering, and the sample count of the dummy
texture must be set properly otherwise.
This commit is contained in:
Chip Davis 2020-09-15 13:32:33 -05:00
parent 67d4b335be
commit 68c8146729
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
View File

@ -1265,7 +1265,6 @@ void MVKPhysicalDevice::initFeatures() {
_features.shaderClipDistance = true; _features.shaderClipDistance = true;
_features.shaderInt16 = true; _features.shaderInt16 = true;
_features.multiDrawIndirect = true; _features.multiDrawIndirect = true;
_features.variableMultisampleRate = true;
_features.inheritedQueries = true; _features.inheritedQueries = true;
_features.shaderSampledImageArrayDynamicIndexing = _metalFeatures.arrayOfTextures; _features.shaderSampledImageArrayDynamicIndexing = _metalFeatures.arrayOfTextures;
@ -1407,7 +1406,7 @@ void MVKPhysicalDevice::initFeatures() {
// VkBool32 sparseResidency8Samples; // VkBool32 sparseResidency8Samples;
// VkBool32 sparseResidency16Samples; // VkBool32 sparseResidency16Samples;
// VkBool32 sparseResidencyAliased; // VkBool32 sparseResidencyAliased;
// VkBool32 variableMultisampleRate; // done // VkBool32 variableMultisampleRate;
// VkBool32 inheritedQueries; // done // VkBool32 inheritedQueries; // done
//} VkPhysicalDeviceFeatures; //} VkPhysicalDeviceFeatures;

1
MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm
View File

@ -1353,6 +1353,7 @@ void MVKGraphicsPipeline::addFragmentOutputToPipeline(MTLRenderPipelineDescripto
// Multisampling // Multisampling
if (pCreateInfo->pMultisampleState) { if (pCreateInfo->pMultisampleState) {
plDesc.sampleCount = mvkSampleCountFromVkSampleCountFlagBits(pCreateInfo->pMultisampleState->rasterizationSamples); plDesc.sampleCount = mvkSampleCountFromVkSampleCountFlagBits(pCreateInfo->pMultisampleState->rasterizationSamples);
mvkRenderSubpass->setDefaultSampleCount(pCreateInfo->pMultisampleState->rasterizationSamples);
plDesc.alphaToCoverageEnabled = pCreateInfo->pMultisampleState->alphaToCoverageEnable; plDesc.alphaToCoverageEnabled = pCreateInfo->pMultisampleState->alphaToCoverageEnable;
plDesc.alphaToOneEnabled = pCreateInfo->pMultisampleState->alphaToOneEnable; plDesc.alphaToOneEnabled = pCreateInfo->pMultisampleState->alphaToOneEnable;
} }

4
MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.h
View File

@ -67,6 +67,9 @@ public:
/** Returns the Vulkan sample count of the attachments used in this subpass. */ /** Returns the Vulkan sample count of the attachments used in this subpass. */
VkSampleCountFlagBits getSampleCount(); VkSampleCountFlagBits getSampleCount();
/** Sets the default sample count for when there are no attachments used in this subpass. */
void setDefaultSampleCount(VkSampleCountFlagBits count) { _defaultSampleCount = count; }
/** Returns whether or not this is a multiview subpass. */ /** Returns whether or not this is a multiview subpass. */
bool isMultiview() const { return _viewMask != 0; } bool isMultiview() const { return _viewMask != 0; }
@ -141,6 +144,7 @@ private:
MVKSmallVector<uint32_t, kMVKDefaultAttachmentCount> _preserveAttachments; MVKSmallVector<uint32_t, kMVKDefaultAttachmentCount> _preserveAttachments;
VkAttachmentReference2 _depthStencilAttachment; VkAttachmentReference2 _depthStencilAttachment;
id<MTLTexture> _mtlDummyTex = nil; id<MTLTexture> _mtlDummyTex = nil;
VkSampleCountFlagBits _defaultSampleCount = VK_SAMPLE_COUNT_1_BIT;
}; };

24
MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.mm
View File

@ -259,10 +259,11 @@ void MVKRenderSubpass::populateMTLRenderPassDescriptor(MTLRenderPassDescriptor*
_mtlDummyTex = nil; _mtlDummyTex = nil;
if (caUsedCnt == 0 && dsRPAttIdx == VK_ATTACHMENT_UNUSED) { if (caUsedCnt == 0 && dsRPAttIdx == VK_ATTACHMENT_UNUSED) {
uint32_t sampleCount = mvkSampleCountFromVkSampleCountFlagBits(_defaultSampleCount);
if (_renderPass->getDevice()->_pMetalFeatures->renderWithoutAttachments) { if (_renderPass->getDevice()->_pMetalFeatures->renderWithoutAttachments) {
// We support having no attachments. // We support having no attachments.
#if MVK_MACOS_OR_IOS #if MVK_MACOS_OR_IOS
mtlRPDesc.defaultRasterSampleCount = 1; mtlRPDesc.defaultRasterSampleCount = sampleCount;
#endif #endif
return; return;
} }
@ -271,11 +272,32 @@ void MVKRenderSubpass::populateMTLRenderPassDescriptor(MTLRenderPassDescriptor*
VkExtent2D fbExtent = framebuffer->getExtent2D(); VkExtent2D fbExtent = framebuffer->getExtent2D();
MTLTextureDescriptor* mtlTexDesc = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat: MTLPixelFormatR8Unorm width: fbExtent.width height: fbExtent.height mipmapped: NO]; MTLTextureDescriptor* mtlTexDesc = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat: MTLPixelFormatR8Unorm width: fbExtent.width height: fbExtent.height mipmapped: NO];
if (isMultiview()) { if (isMultiview()) {
#if MVK_MACOS
if (sampleCount > 1 && _renderPass->getDevice()->_pMetalFeatures->multisampleLayeredRendering) {
mtlTexDesc.textureType = MTLTextureType2DMultisampleArray;
mtlTexDesc.sampleCount = sampleCount;
} else {
mtlTexDesc.textureType = MTLTextureType2DArray;
}
#else
mtlTexDesc.textureType = MTLTextureType2DArray; mtlTexDesc.textureType = MTLTextureType2DArray;
#endif
mtlTexDesc.arrayLength = getViewCountInMetalPass(passIdx); mtlTexDesc.arrayLength = getViewCountInMetalPass(passIdx);
} else if (framebuffer->getLayerCount() > 1) { } else if (framebuffer->getLayerCount() > 1) {
#if MVK_MACOS
if (sampleCount > 1 && _renderPass->getDevice()->_pMetalFeatures->multisampleLayeredRendering) {
mtlTexDesc.textureType = MTLTextureType2DMultisampleArray;
mtlTexDesc.sampleCount = sampleCount;
} else {
mtlTexDesc.textureType = MTLTextureType2DArray;
}
#else
mtlTexDesc.textureType = MTLTextureType2DArray; mtlTexDesc.textureType = MTLTextureType2DArray;
#endif
mtlTexDesc.arrayLength = framebuffer->getLayerCount(); mtlTexDesc.arrayLength = framebuffer->getLayerCount();
} else if (sampleCount > 1) {
mtlTexDesc.textureType = MTLTextureType2DMultisample;
mtlTexDesc.sampleCount = sampleCount;
} }
#if MVK_IOS #if MVK_IOS
if ([_renderPass->getMTLDevice() supportsFeatureSet: MTLFeatureSet_iOS_GPUFamily1_v3]) { if ([_renderPass->getMTLDevice() supportsFeatureSet: MTLFeatureSet_iOS_GPUFamily1_v3]) {