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

Merge pull request #2073 from cdavis5e/min-max-descriptor-count

Browse Source 
MVKDevice: Clamp max per-set descriptor limit to minimum 1024.
This commit is contained in:
Bill Hollings 2023-11-23 09:21:37 -05:00 committed by GitHub
commit 645aaa4ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -403,6 +403,7 @@ protected:
uint64_t getRecommendedMaxWorkingSetSize(); uint64_t getRecommendedMaxWorkingSetSize();
uint64_t getCurrentAllocatedSize(); uint64_t getCurrentAllocatedSize();
uint32_t getMaxSamplerCount(); uint32_t getMaxSamplerCount();
uint32_t getMaxPerSetDescriptorCount();
void initExternalMemoryProperties(); void initExternalMemoryProperties();
void initExtensions(); void initExtensions();
void initCounterSets(); void initCounterSets();

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

@ -525,9 +525,7 @@ void MVKPhysicalDevice::getProperties(VkPhysicalDeviceProperties2* properties) {
supportedProps11.maxMultiviewViewCount = 32; supportedProps11.maxMultiviewViewCount = 32;
supportedProps11.maxMultiviewInstanceIndex = canUseInstancingForMultiview() ? uintMax / 32 : uintMax; supportedProps11.maxMultiviewInstanceIndex = canUseInstancingForMultiview() ? uintMax / 32 : uintMax;
supportedProps11.protectedNoFault = false; supportedProps11.protectedNoFault = false;
supportedProps11.maxPerSetDescriptors = 4 * (_metalFeatures.maxPerStageBufferCount + supportedProps11.maxPerSetDescriptors = getMaxPerSetDescriptorCount();
_metalFeatures.maxPerStageTextureCount +
_metalFeatures.maxPerStageSamplerCount);
supportedProps11.maxMemoryAllocationSize = _metalFeatures.maxMTLBufferSize; supportedProps11.maxMemoryAllocationSize = _metalFeatures.maxMTLBufferSize;
// Create a SSOT for these Vulkan 1.2 properties, which can be queried via two mechanisms here. // Create a SSOT for these Vulkan 1.2 properties, which can be queried via two mechanisms here.
@ -3150,6 +3148,13 @@ uint32_t MVKPhysicalDevice::getMaxSamplerCount() {
} }
} }
// Vulkan imposes a minimum maximum of 1024 descriptors per set.
uint32_t MVKPhysicalDevice::getMaxPerSetDescriptorCount() {
return max(4 * (_metalFeatures.maxPerStageBufferCount +
_metalFeatures.maxPerStageTextureCount +
_metalFeatures.maxPerStageSamplerCount), 1024u);
}
void MVKPhysicalDevice::initExternalMemoryProperties() { void MVKPhysicalDevice::initExternalMemoryProperties() {
// Common // Common
@ -3507,7 +3512,7 @@ void MVKDevice::getDescriptorSetLayoutSupport(const VkDescriptorSetLayoutCreateI
for (uint32_t i = 0; i < pCreateInfo->bindingCount; i++) { for (uint32_t i = 0; i < pCreateInfo->bindingCount; i++) {
descriptorCount += pCreateInfo->pBindings[i].descriptorCount; descriptorCount += pCreateInfo->pBindings[i].descriptorCount;
} }
pSupport->supported = (descriptorCount < ((_physicalDevice->_metalFeatures.maxPerStageBufferCount + _physicalDevice->_metalFeatures.maxPerStageTextureCount + _physicalDevice->_metalFeatures.maxPerStageSamplerCount) * 2)); pSupport->supported = (descriptorCount < _physicalDevice->getMaxPerSetDescriptorCount());
// Check whether the layout has a variable-count descriptor, and if so, whether we can support it. // Check whether the layout has a variable-count descriptor, and if so, whether we can support it.
for (auto* next = (VkBaseOutStructure*)pSupport->pNext; next; next = next->pNext) { for (auto* next = (VkBaseOutStructure*)pSupport->pNext; next; next = next->pNext) {