WIP

TheIronWolfModding · Jul 31, 2024 · 554c657 · 554c657
1 parent c7d43f2
commit 554c657
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/meson.build b/meson.build
@@ -19,6 +19,7 @@ compiler_args = [
   '-Wno-missing-field-initializers',
   '-Wno-unused-parameter',
   '-Wno-cast-function-type', # Needed for GetProcAddress.
+  '-Wno-unused-but-set-variable', # D3D9 empty lock.
   # clang
   '-Wno-unused-private-field',
   '-Wno-microsoft-exception-spec',

diff --git a/src/d3d9/d3d9_device.h b/src/d3d9/d3d9_device.h
@@ -931,10 +931,15 @@ namespace dxvk {
             UINT                              Stride);
 
     void BindIndices();
-
+#ifdef GTR2_SPECIFIC_D3D9_MULTITHREADED
     D3D9DeviceLock LockDevice() {
       return m_multithread.AcquireLock();
     }
+#else
+    D3D9DeviceLock LockDevice() {
+      return D3D9DeviceLock();
+    }
+#endif // GTR2_SPECIFIC_D3D9_MULTITHREADED
 
     const D3D9Options* GetOptions() const {
       return &m_d3d9Options;

diff --git a/src/d3d9/d3d9_multithread.h b/src/d3d9/d3d9_multithread.h
@@ -12,6 +12,7 @@ namespace dxvk {
    * \c std::unique_lock, with the goal of being
    * cheaper to construct and destroy.
    */
+#ifdef GTR2_SPECIFIC_D3D9_MULTITHREADED
   class D3D9DeviceLock {
 
   public:
@@ -48,7 +49,10 @@ namespace dxvk {
     sync::RecursiveSpinlock* m_mutex;
 
   };
-
+#else
+struct D3D9DeviceLock
+{};
+#endif // GTR2_SPECIFIC_D3D9_MULTITHREADED
 
   /**
    * \brief D3D9 context lock
@@ -59,12 +63,13 @@ namespace dxvk {
 
     D3D9Multithread(
       BOOL                  Protected);
-
+#ifdef GTR2_SPECIFIC_D3D9_MULTITHREADED
     D3D9DeviceLock AcquireLock() {
       return m_protected
         ? D3D9DeviceLock(m_mutex)
         : D3D9DeviceLock();
     }
+#endif // GTR2_SPECIFIC_D3D9_MULTITHREADED
 
   private: