Merge pull request #1823 from billhollings/update-physdev_limits
Set more accurate values for some VkPhysicalDeviceLimits members.
diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md
index 7c484c7..3ac6bab 100644
--- a/Docs/Whats_New.md
+++ b/Docs/Whats_New.md
@@ -26,6 +26,10 @@
statically linked to an app that calls all Vulkan functions dynamically.
- Per Vulkan 1.2 spec, support calling `vkGetInstanceProcAddr()` with a
null instance, when `vkGetInstanceProcAddr` itself is the function name.
+- Update `VkPhysicalDeviceLimits` members `maxClipDistances` and
+ `maxCombinedClipAndCullDistances` to more accurate values.
+- Update `VkPhysicalDeviceLimits::maxDrawIndexedIndexValue` to
+ acknowledge automatic primitive restart.
- Update copyright notices to year 2023.
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
index 5f0721b..971dd1b 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
@@ -2239,6 +2239,11 @@
_properties.limits.maxDescriptorSetStorageImages = (_properties.limits.maxPerStageDescriptorStorageImages * 5);
_properties.limits.maxDescriptorSetInputAttachments = (_properties.limits.maxPerStageDescriptorInputAttachments * 5);
+ _properties.limits.maxClipDistances = 8; // Per Apple engineers.
+ _properties.limits.maxCullDistances = 0; // unsupported
+ _properties.limits.maxCombinedClipAndCullDistances = max(_properties.limits.maxClipDistances,
+ _properties.limits.maxCullDistances); // If supported, these consume the same slots.
+
// Whether handled as a real texture buffer or a 2D texture, this value is likely nowhere near the size of a buffer,
// needs to fit in 32 bits, and some apps (I'm looking at you, CTS), assume it is low when doing 32-bit math.
_properties.limits.maxTexelBufferElements = _properties.limits.maxImageDimension2D * (4 * KIBI);
@@ -2486,7 +2491,8 @@
_properties.limits.minTexelGatherOffset = _properties.limits.minTexelOffset;
_properties.limits.maxTexelGatherOffset = _properties.limits.maxTexelOffset;
- // Features with no specific limits - default to unlimited int values
+
+ // Features with no specific limits - default to effectively unlimited int values
_properties.limits.maxMemoryAllocationCount = kMVKUndefinedLargeUInt32;
_properties.limits.maxSamplerAllocationCount = getMaxSamplerCount();
@@ -2496,17 +2502,12 @@
_properties.limits.maxComputeWorkGroupCount[1] = kMVKUndefinedLargeUInt32;
_properties.limits.maxComputeWorkGroupCount[2] = kMVKUndefinedLargeUInt32;
- _properties.limits.maxDrawIndexedIndexValue = numeric_limits<uint32_t>::max(); // Must be (2^32 - 1) to support fullDrawIndexUint32
+ _properties.limits.maxDrawIndexedIndexValue = numeric_limits<uint32_t>::max() - 1; // Support both fullDrawIndexUint32 and automatic primitive restart.
_properties.limits.maxDrawIndirectCount = kMVKUndefinedLargeUInt32;
- _properties.limits.maxClipDistances = kMVKUndefinedLargeUInt32;
- _properties.limits.maxCullDistances = 0; // unsupported
- _properties.limits.maxCombinedClipAndCullDistances = _properties.limits.maxClipDistances +
- _properties.limits.maxCullDistances;
-
// Features with unknown limits - default to Vulkan required limits
-
+
_properties.limits.subPixelPrecisionBits = 4;
_properties.limits.subTexelPrecisionBits = 4;
_properties.limits.mipmapPrecisionBits = 4;
