Sync with upstream DXVK master

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,36 @@
+name: Bug report
+description: Report crashes, rendering issues etc.
+body:
+  - type: checkboxes
+    attributes:
+      label: "By opening this issue, I confirm that:"
+      options:
+        - label: "I have not copy-pasted an LLM-generated response into the description."
+          required: true
+  - type: textarea
+    attributes:
+      label: Description
+      value: |
+        Please describe your issue as accurately as possible. Include screenshots or videos when relevant.
+        
+        If you use Windows, please check the following page: https://github.com/doitsujin/dxvk/wiki/Windows
+        
+        ### Software information
+        Name of the game, settings used etc. Include any mods or add-ons if applicable.
+        
+        ### System information
+        - GPU:
+        - Driver:
+        - Wine version: 
+        - DXVK version: 
+        
+        ### Apitrace file(s)
+        - Put a link here
+        
+        For instructions on how to use apitrace, see: https://github.com/doitsujin/dxvk/wiki/Using-Apitrace
+        
+        ### Log files
+        Please attach Proton or Wine logs as a text file:
+        - When using Proton, set the Steam launch options for your game to `PROTON_LOG=1 %command%` and attach the corresponding `steam-xxxxx.log` file in your home directory.
+        - When using regular Wine, use `wine game.exe > game.log 2>&1` and attach the resulting `game.log` file.
+        - On Windows, DXVK log files will usually appear next to the games exe or in its base folder.

.github/ISSUE_TEMPLATE/other.yml

@@ -0,0 +1,16 @@
+name: Other
+description: Questions, feature requests etc.
+body:
+  - type: checkboxes
+    attributes:
+      label: "By opening this issue, I confirm that:"
+      options:
+        - label: "I have not copy-pasted an LLM-generated response into the description."
+          required: true
+  - type: textarea
+    attributes:
+      label: Description
+      value: |
+        <!--
+        Not for reporting bugs. Please use the Bug report template instead
+        -->

dxvk.conf

@@ -96,44 +96,13 @@
 # dxvk.maxFrameRate = 0
 
 
-# Controls latency sleep and Nvidia Reflex support.
-#
-# Supported values:
-# - Auto: By default, DXVK only supports latency sleep in D3D11 games that
-#         use Reflex if the graphics driver supports VK_NV_low_latency2,
-#         and if dxvk-nvapi is enabled in Proton.
-# - True: Enables built-in latency reduction based on internal timings.
-#         This assumes that input sampling for any given frame happens after
-#         the D3D9 or DXGI Present call returns; games that render and present
-#         asynchronously will not behave as intended.
-#         Similarly, this will not have any effect in games with built-in frame
-#         rate limiters, or if an external limiter (such as MangoHud) is used.
-#         In some games, enabling this may reduce performance or lead to less
-#         consistent frame pacing.
-#         The implementation will either use VK_NV_low_latency2 if supported
-#         by the driver, or a custom algorithm.
-# - False: Disable Reflex support as well as built-in latency reduction.
-
-# dxvk.latencySleep = Auto
-
-
-# Tolerance for the latency sleep heuristic, in microseconds. Higher values
-# increase latency, but may lead to better frame pacing in some cases. Does
-# not have any effect if NV_low_latency2 is used.
-#
-# Supported values: Any non-negative number
-
-# dxvk.latencyTolerance = 1000
-
-
-# Disables the use of VK_NV_low_latency2. This will make Reflex unavailable
-# in games, and if dxvk.latencySleep is set to True, a custom algorithm will
-# be used for latency control. By default, the extension will not be used in
-# 32-bit applications due to driver issues.
+# Whether to enable VK_NV_low_latency2 for the Reflex implementation.
+# On 32-bit, this is disabled by default due to massive frame pacing
+# issues.
 #
 # Supported values: Auto, True, False
 
-# dxvk.disableNvLowLatency2 = Auto
+# dxvk.enableNvLowLatency2 = Auto
 
 
 # Override PCI vendor and device IDs reported to the application. Can

include/native/windows/windows_base.h

@@ -216,6 +216,8 @@ typedef struct RGNDATA {
 #define WAIT_OBJECT_0		0
 #define WAIT_ABANDONED  0x00000080
 
+#define INFINITE 0xffffffff
+
 #define interface struct
 #define MIDL_INTERFACE(x) struct
 

meson.build

@@ -73,6 +73,15 @@ if platform == 'windows'
       '-Wl,--file-alignment=4096',
     ]
 
+    # Follow PE standards with 8 character name sections, some software that
+    # inspects our DLLs may otherwise crash. For dwarf2 symbols to work we
+    # need to keep the mingw defaults.
+    if not get_option('debug')
+      link_args += [
+        '-Wl,--disable-long-section-names',
+      ]
+    endif
+
     # Wine's built-in back traces only work with dwarf4 symbols
     if get_option('debug')
       compiler_args += [

src/d3d11/d3d11_buffer.cpp

@@ -13,6 +13,7 @@ namespace dxvk {
     m_desc        (*pDesc),
     m_resource    (this, pDevice),
     m_d3d10       (this),
+    m_interop     (this),
     m_destructionNotifier(this) {
     DxvkBufferCreateInfo info;
     info.flags  = 0;
@@ -158,6 +159,11 @@ namespace dxvk {
        return S_OK;
     }
 
+    if (riid == __uuidof(IDXGIVkInteropBuffer)) {
+      *ppvObject = ref(&m_interop);
+      return S_OK;
+    }
+
     if (riid == __uuidof(ID3DDestructionNotifier)) {
       *ppvObject = ref(&m_destructionNotifier);
       return S_OK;

src/d3d11/d3d11_buffer.h

@@ -35,7 +35,44 @@ namespace dxvk {
     uint32_t byteOffset;
   };
 
-
+
+  /**
+   * \brief Interop interface for buffers
+   */
+  class D3D11VkInteropBuffer : public IDXGIVkInteropBuffer {
+
+  public:
+
+    D3D11VkInteropBuffer(D3D11Buffer* pBuffer);
+
+    ~D3D11VkInteropBuffer();
+
+    ULONG STDMETHODCALLTYPE AddRef();
+
+    ULONG STDMETHODCALLTYPE Release();
+
+    HRESULT STDMETHODCALLTYPE QueryInterface(
+            REFIID                  riid,
+            void**                  ppvObject);
+
+    HRESULT STDMETHODCALLTYPE GetDevice(
+            IDXGIVkInteropDevice**  ppDevice);
+
+    HRESULT STDMETHODCALLTYPE GetVulkanBufferInfo(
+            VkDeviceAddress*        pGpuAddress,
+            VkBuffer*               pHandle,
+            VkDeviceSize*           pOffset,
+            VkBufferCreateInfo*     pInfo);
+
+  private:
+
+    D3D11Buffer* m_buffer = nullptr;
+
+    std::atomic<bool> m_locked = { false };
+
+  };
+
+
   class D3D11Buffer : public D3D11DeviceChild<ID3D11Buffer> {
     static constexpr VkDeviceSize BufferSliceAlignment = 64;
   public:
@@ -199,6 +236,7 @@ namespace dxvk {
 
     D3D11DXGIResource             m_resource;
     D3D10Buffer                   m_d3d10;
+    D3D11VkInteropBuffer          m_interop;
 
     D3DDestructionNotifier        m_destructionNotifier;
 
@@ -216,43 +254,6 @@ namespace dxvk {
   };
 
 
-  /**
-   * \brief Interop i
-   */
-  class D3D11VkInteropBuffer : public IDXGIVkInteropBuffer {
-
-  public:
-
-    D3D11VkInteropBuffer(D3D11Buffer* pBuffer);
-
-    ~D3D11VkInteropBuffer();
-
-    ULONG STDMETHODCALLTYPE AddRef();
-
-    ULONG STDMETHODCALLTYPE Release();
-
-    HRESULT STDMETHODCALLTYPE QueryInterface(
-            REFIID                  riid,
-            void**                  ppvObject);
-
-    HRESULT STDMETHODCALLTYPE GetDevice(
-            IDXGIVkInteropDevice**  ppDevice);
-
-    HRESULT STDMETHODCALLTYPE GetVulkanBufferInfo(
-            VkDeviceAddress*        pGpuAddress,
-            VkBuffer*               pHandle,
-            VkDeviceSize*           pOffset,
-            VkBufferCreateInfo*     pInfo);
-
-  private:
-
-    D3D11Buffer* m_buffer = nullptr;
-
-    std::atomic<bool> m_locked = { false };
-
-  };
-
-
   /**
    * \brief Retrieves buffer from resource pointer
    * 

src/d3d11/d3d11_context.cpp

@@ -191,11 +191,25 @@ namespace dxvk {
     if (!pResourceView || (NumRects && pRects))
       return;
 
-    // ID3D11View has no methods to query the exact type of
-    // the view, so we'll have to check each possible class
-    auto dsv = dynamic_cast<D3D11DepthStencilView*>(pResourceView);
-    auto rtv = dynamic_cast<D3D11RenderTargetView*>(pResourceView);
-    auto uav = dynamic_cast<D3D11UnorderedAccessView*>(pResourceView);
+    // ID3D11View has no methods to query the exact type of the view,
+    // so we'll have to check each possible class. Query through COM
+    // rather than dynamic_cast: dynamic_cast relies on RTTI metadata
+    // stored just before the object's vtable, which third-party
+    // vtable-swapping hooks (e.g. overlay/injector DLLs that clone
+    // only the visible function-pointer table) do not preserve, even
+    // though they preserve the table itself well enough for ordinary
+    // virtual calls like QueryInterface to keep working correctly.
+    Com<ID3D11DepthStencilView> qiDsv;
+    Com<ID3D11RenderTargetView> qiRtv;
+    Com<ID3D11UnorderedAccessView> qiUav;
+
+    pResourceView->QueryInterface(IID_PPV_ARGS(&qiDsv));
+    pResourceView->QueryInterface(IID_PPV_ARGS(&qiRtv));
+    pResourceView->QueryInterface(IID_PPV_ARGS(&qiUav));
+
+    auto dsv = static_cast<D3D11DepthStencilView*>(qiDsv.ptr());
+    auto rtv = static_cast<D3D11RenderTargetView*>(qiRtv.ptr());
+    auto uav = static_cast<D3D11UnorderedAccessView*>(qiUav.ptr());
 
     if (rtv && rtv->GetBufferView())
       return;
@@ -725,12 +739,23 @@ namespace dxvk {
 
     AddCost(GpuCostEstimate::Transfer);
 
-    // ID3D11View has no methods to query the exact type of
-    // the view, so we'll have to check each possible class
-    auto dsv = dynamic_cast<D3D11DepthStencilView*>(pView);
-    auto rtv = dynamic_cast<D3D11RenderTargetView*>(pView);
-    auto uav = dynamic_cast<D3D11UnorderedAccessView*>(pView);
-    auto vov = dynamic_cast<D3D11VideoProcessorOutputView*>(pView);
+    // ID3D11View has no methods to query the exact type of the view,
+    // so we'll have to check each possible class. Query through COM
+    // rather than dynamic_cast; see DiscardViewBase for why.
+    Com<ID3D11DepthStencilView> qiDsv;
+    Com<ID3D11RenderTargetView> qiRtv;
+    Com<ID3D11UnorderedAccessView> qiUav;
+    Com<ID3D11VideoProcessorOutputView> qiVov;
+
+    pView->QueryInterface(IID_PPV_ARGS(&qiDsv));
+    pView->QueryInterface(IID_PPV_ARGS(&qiRtv));
+    pView->QueryInterface(IID_PPV_ARGS(&qiUav));
+    pView->QueryInterface(IID_PPV_ARGS(&qiVov));
+
+    auto dsv = static_cast<D3D11DepthStencilView*>(qiDsv.ptr());
+    auto rtv = static_cast<D3D11RenderTargetView*>(qiRtv.ptr());
+    auto uav = static_cast<D3D11UnorderedAccessView*>(qiUav.ptr());
+    auto vov = static_cast<D3D11VideoProcessorOutputView*>(qiVov.ptr());
 
     // Retrieve underlying resource view
     if (dsv) {