[dxvk] Re-add workaround for failed device creation with NVX extensions

Apparently Planetside 2 needs this. Obviously this means no DLSS for
affected users.

Author: doitsujin

src/dxvk/dxvk_adapter.cpp

@@ -161,26 +161,41 @@ namespace dxvk {
 
 
   Rc<DxvkDevice> DxvkAdapter::createDevice() {
+    Rc<DxvkDevice> device = createDevice(false);
+
+    if (!device)
+      device = createDevice(true);
+
+    if (!device)
+      throw DxvkError("Failed to initialize DXVK device.");
+
+    return device;
+  }
+
+
+  Rc<DxvkDevice> DxvkAdapter::createDevice(bool safeMode) {
     auto vk = m_instance->vki();
 
+    DxvkDeviceCapabilities caps(*m_instance, m_handle, nullptr, safeMode);
+
     Logger::info("Creating device:");
-    m_capabilities.logDeviceInfo();
+    caps.logDeviceInfo();
 
     // Get device features to enable
     size_t featureBlobSize = 0u;
-    m_capabilities.queryDeviceFeatures(&featureBlobSize, nullptr);
+    caps.queryDeviceFeatures(&featureBlobSize, nullptr);
 
     std::vector<char> featureBlob(featureBlobSize);
-    m_capabilities.queryDeviceFeatures(&featureBlobSize, featureBlob.data());
+    caps.queryDeviceFeatures(&featureBlobSize, featureBlob.data());
 
     auto features = reinterpret_cast<const VkPhysicalDeviceFeatures2*>(featureBlob.data());
 
     // Get extension list and add extra extensions
     uint32_t extensionCount = 0u;
-    m_capabilities.queryDeviceExtensions(&extensionCount, nullptr);
+    caps.queryDeviceExtensions(&extensionCount, nullptr);
 
     std::vector<VkExtensionProperties> extensions(extensionCount);
-    m_capabilities.queryDeviceExtensions(&extensionCount, extensions.data());
+    caps.queryDeviceExtensions(&extensionCount, extensions.data());
 
     for (const auto& extra : m_extraExtensions) {
       bool found = false;
@@ -202,13 +217,13 @@ namespace dxvk {
       extensionNames.push_back(ext.extensionName);
 
     // Query queue infos
-    DxvkDeviceQueueMapping queueMapping = m_capabilities.getQueueMapping();
+    DxvkDeviceQueueMapping queueMapping = caps.getQueueMapping();
 
     uint32_t queueCount = { };
-    m_capabilities.queryDeviceQueues(&queueCount, nullptr);
+    caps.queryDeviceQueues(&queueCount, nullptr);
 
     std::vector<VkDeviceQueueCreateInfo> queues(queueCount, { VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO });
-    m_capabilities.queryDeviceQueues(&queueCount, queues.data());
+    caps.queryDeviceQueues(&queueCount, queues.data());
 
     uint32_t priorityCount = 0u;
 
@@ -224,7 +239,7 @@ namespace dxvk {
       priorityIndex += q.queueCount;
     }
 
-    m_capabilities.queryDeviceQueues(&queueCount, queues.data());
+    caps.queryDeviceQueues(&queueCount, queues.data());
 
     // Create the actual Vulkan device
     VkDeviceCreateInfo deviceInfo = { VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO };
@@ -238,8 +253,11 @@ namespace dxvk {
     VkDevice device = VK_NULL_HANDLE;
     VkResult vr = vk->vkCreateDevice(m_handle, &deviceInfo, nullptr, &device);
 
-    if (vr)
-      throw DxvkError(str::format("Failed to create Vulkan device: ", vr));
+    if (vr) {
+      Logger::err(str::format("Failed to create Vulkan device: ", vr,
+        safeMode ? "" : ", retrying 'safe mode'."));
+      return nullptr;
+    }
 
     Rc<vk::DeviceFn> vkd = new vk::DeviceFn(vk, true, device);
 
@@ -248,7 +266,7 @@ namespace dxvk {
     deviceQueues.transfer = getDeviceQueue(vkd, queueMapping.transfer);
     deviceQueues.sparse   = getDeviceQueue(vkd, queueMapping.sparse);
 
-    return new DxvkDevice(m_instance, this, vkd, m_capabilities.getFeatures(), deviceQueues, DxvkQueueCallback());
+    return new DxvkDevice(m_instance, this, vkd, caps.getFeatures(), deviceQueues, DxvkQueueCallback());
   }
 
 

src/dxvk/dxvk_adapter.h

@@ -322,6 +322,8 @@ namespace dxvk {
 
     std::array<DxvkAdapterMemoryStats, VK_MAX_MEMORY_HEAPS> m_memoryStats = { };
 
+    Rc<DxvkDevice> createDevice(bool safeMode);
+
   };
 
 }

src/dxvk/dxvk_device_info.cpp

@@ -88,7 +88,8 @@ namespace dxvk {
   DxvkDeviceCapabilities::DxvkDeviceCapabilities(
     const DxvkInstance&               instance,
           VkPhysicalDevice            adapter,
-    const VkDeviceCreateInfo*         deviceInfo) {
+    const VkDeviceCreateInfo*         deviceInfo,
+          bool                        safeMode) {
     // Can't query anything on a Vulkan 1.0 device
     auto vk = instance.vki();
     vk->vkGetPhysicalDeviceProperties(adapter, &m_properties.core.properties);
@@ -102,7 +103,7 @@ namespace dxvk {
     initQueueProperties(instance, adapter, deviceInfo);
     initMemoryProperties(instance, adapter);
 
-    disableUnusedFeatures(instance);
+    disableUnusedFeatures(instance, safeMode);
 
     enableFeaturesAndExtensions();
     enableQueues();
@@ -456,7 +457,8 @@ namespace dxvk {
 
 
   void DxvkDeviceCapabilities::disableUnusedFeatures(
-    const DxvkInstance&               instance) {
+    const DxvkInstance&               instance,
+          bool                        safeMode) {
     if (m_featuresSupported.extDescriptorHeap.descriptorHeap) {
       // Only enable descriptor heaps on drivers that are either known to work,
       // or are maintained well enough that any issues are likely to get fixed
@@ -502,14 +504,16 @@ namespace dxvk {
     if (!instance.options().enableUnifiedImageLayout)
       m_featuresSupported.khrUnifiedImageLayouts.unifiedImageLayouts = VK_FALSE;
 
-    if (env::is32BitHostPlatform()) {
-      // CUDA interop is unnecessary on 32-bit, no games use it
+    if (env::is32BitHostPlatform() || safeMode) {
+      // CUDA interop is unnecessary on 32-bit, no games use it. These extensions
+      // can also cause device creation errors for unknown reasons.
       m_featuresSupported.nvxBinaryImport = VK_FALSE;
       m_featuresSupported.nvxImageViewHandle = VK_FALSE;
+    }
 
-      // Reflex is broken on 32-bit
+    // Reflex is broken on 32-bit
+    if (env::is32BitHostPlatform())
       m_featuresSupported.nvLowLatency2 = VK_FALSE;
-    }
 
     // EXT_multi_draw is broken on proprietary qcom on some devices
     if (m_properties.vk12.driverID == VK_DRIVER_ID_QUALCOMM_PROPRIETARY)

src/dxvk/dxvk_device_info.h

@@ -207,7 +207,8 @@ namespace dxvk {
     DxvkDeviceCapabilities(
       const DxvkInstance&               instance,
             VkPhysicalDevice            adapter,
-      const VkDeviceCreateInfo*         deviceInfo);
+      const VkDeviceCreateInfo*         deviceInfo,
+            bool                        safeMode = false);
 
     DxvkDeviceCapabilities(const DxvkDeviceCapabilities&) = delete;
 
@@ -370,7 +371,8 @@ namespace dxvk {
             VkPhysicalDevice            adapter);
 
     void disableUnusedFeatures(
-      const DxvkInstance&               instance);
+      const DxvkInstance&               instance,
+            bool                        safeMode);
 
     void enableFeaturesAndExtensions();