Improve DXVK compatibility

Author: FakeMichau

OptiScaler/hooks/Vulkan_Hooks.cpp

@@ -170,7 +170,7 @@ static VkResult hkvkCreateDevice(VkPhysicalDevice physicalDevice, const VkDevice
 
         if (idProps.deviceLUIDValid == VK_TRUE)
         {
-            auto primaryGpu = IdentifyGpu::getPrimaryGpu();
+            auto primaryGpu = IdentifyGpu::getPrimaryGpuVulkan();
             auto luid = (PLUID) idProps.deviceLUID;
             if (!IsEqualLUID(*luid, primaryGpu.luid))
                 LOG_WARN("VkDevice created with non-primary GPU");

OptiScaler/misc/IdentifyGpu.cpp

@@ -85,8 +85,8 @@ std::vector<GpuInformation> IdentifyGpu::checkGpuInfo()
             std::wstring szName(adapterDesc.Description);
             gpuInfo.name = wstring_to_string(szName);
 
-            ComPtr<IDXGIVkInteropDevice> dxgiInterop;
-            if (SUCCEEDED(adapter->QueryInterface(IID_PPV_ARGS(&dxgiInterop))))
+            ComPtr<IDXGIDXVKAdapter> dxvkAdapter;
+            if (SUCCEEDED(adapter->QueryInterface(IID_PPV_ARGS(&dxvkAdapter))))
                 gpuInfo.usesDxvk = true;
 
             // Needed to be able to query amdxc and check for vkd3d-proton
@@ -224,9 +224,6 @@ std::vector<GpuInformation> IdentifyGpu::checkGpuInfoVulkan()
     createInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
     createInfo.pApplicationInfo = &appInfo;
 
-    // while (!IsDebuggerPresent())
-    //     Sleep(100);
-
     auto winevulkan = LoadLibraryA("winevulkan.dll");
 
     auto o_vkCreateInstance = vkCreateInstance;

OptiScaler/misc/IdentifyGpu.h

@@ -31,11 +31,12 @@ ID3D12DXVKInteropDevice : public IUnknown
 };
 
 // dxvk
-MIDL_INTERFACE("e2ef5fa5-dc21-4af7-90c4-f67ef6a09323")
-IDXGIVkInteropDevice : public IUnknown
+MIDL_INTERFACE("907bf281-ea3c-43b4-a8e4-9f231107b4ff")
+IDXGIDXVKAdapter : public IDXGIAdapter4
 {
-    virtual void STDMETHODCALLTYPE GetVulkanHandles(VkInstance * pInstance, VkPhysicalDevice * pPhysDev,
-                                                    VkDevice * pDevice) = 0;
+    virtual void* STDMETHODCALLTYPE GetDXVKAdapter() = 0;
+
+    virtual void* STDMETHODCALLTYPE GetDXVKInstance() = 0;
 };
 
 struct GpuInformation

OptiScaler/spoofing/Vulkan_Spoofing.cpp

@@ -242,7 +242,7 @@ VkResult VulkanSpoofing::hkvkCreateInstance(VkInstanceCreateInfo* pCreateInfo, c
         newExtensionList.push_back(pCreateInfo->ppEnabledExtensionNames[i]);
     }
 
-    static auto primaryGpu = IdentifyGpu::getPrimaryGpu();
+    static auto primaryGpu = IdentifyGpu::getPrimaryGpuVulkan();
     if (primaryGpu.dlssCapable && Config::Instance()->DLSSEnabled.value_or_default())
     {
         LOG_INFO("Adding NVNGX Vulkan extensions");
@@ -343,7 +343,7 @@ VkResult VulkanSpoofing::hkvkCreateDevice(VkPhysicalDevice physicalDevice, VkDev
     static std::vector<const char*> newExtensionList;
     newExtensionList.clear();
 
-    static auto primaryGpu = IdentifyGpu::getPrimaryGpu();
+    static auto primaryGpu = IdentifyGpu::getPrimaryGpuVulkan();
     LOG_DEBUG("Checking extensions and removing Streamline ones");
     for (size_t i = 0; i < pCreateInfo->enabledExtensionCount; i++)
     {

OptiScaler/wrapped/wrapped_swapchain.cpp

@@ -193,9 +193,10 @@ static HRESULT LocalPresent(IDXGISwapChain* pSwapChain, UINT SyncInterval, UINT
         // Draw overlay
         MenuOverlayDx::Present(pSwapChain, SyncInterval, Flags, pPresentParameters, pDevice, hWnd, isUWP);
 
-        LOG_DEBUG("Calling fakenvapi");
         if (State::Instance().activeFgOutput == FGOutput::FSRFG || State::Instance().activeFgOutput == FGOutput::XeFG)
         {
+            LOG_DEBUG("Calling fakenvapi");
+
             static UINT64 fgPresentFrame = 0;
             auto fgIsActive = fg != nullptr && fg->IsActive() && !fg->IsPaused();