Changeset 105143 in vbox

Timestamp:

Jul 4, 2024 10:43:56 AM (5 months ago)

Author:

vboxsync

Message:

libs/dxvk-2.3.1: Make a few more extensions conditional which are not available with MoltenVK to get further on macOS, bugref:10716

File:

• trunk/src/libs/dxvk-2.3.1/src/dxvk/dxvk_adapter.cpp (modified) (4 diffs)

trunk/src/libs/dxvk-2.3.1/src/dxvk/dxvk_adapter.cpp

@@ -313 +313 @@
       m_deviceFeatures.core.features.variableMultisampleRate;
 
+#ifndef VBOX
     // Always enable memory model so client APIs can use it
     enabledFeatures.vk12.vulkanMemoryModel = VK_TRUE;
+#else
+    /* Not available with MoltenVK. */
+    enabledFeatures.vk12.vulkanMemoryModel = m_deviceFeatures.vk12.vulkanMemoryModel;
+#endif
 
     // Optionally used by some client API extensions
@@ -343 +348 @@
       m_deviceFeatures.vk13.pipelineCreationCacheControl;
 
+#ifndef VBOX
     // Core features that we're relying on in various places
     enabledFeatures.vk13.synchronization2 = VK_TRUE;
     enabledFeatures.vk13.dynamicRendering = VK_TRUE;
+#else
+    /* Not available with MoltenVK. */
+    enabledFeatures.vk13.synchronization2 = m_deviceFeatures.vk13.synchronization2;
+    enabledFeatures.vk13.dynamicRendering = m_deviceFeatures.vk13.dynamicRendering;
+#endif
 
     // We expose depth clip rather than depth clamp to client APIs
@@ -383 +394 @@
       m_deviceFeatures.extMemoryPriority.memoryPriority;
 
+#ifndef VBOX
     // Require robustBufferAccess2 since we use the robustness alignment
     // info in a number of places, and require null descriptor support
@@ -389 +401 @@
     enabledFeatures.extRobustness2.robustImageAccess2 = m_deviceFeatures.extRobustness2.robustImageAccess2;
     enabledFeatures.extRobustness2.nullDescriptor = VK_TRUE;
+#else
+    /* Not available with MoltenVK. */
+    enabledFeatures.extRobustness2.robustBufferAccess2 = m_deviceFeatures.extRobustness2.robustBufferAccess2;
+    enabledFeatures.extRobustness2.robustImageAccess2 = m_deviceFeatures.extRobustness2.robustImageAccess2;
+    enabledFeatures.extRobustness2.nullDescriptor = m_deviceFeatures.extRobustness2.nullDescriptor;
+#endif
 
     // We use this to avoid decompressing SPIR-V shaders in some situations