Update patch for dxvk commit 2405e47

Fixes doitsujin#6 Also extends compatibility to dxvk 1.4.3 Source-commit: 88e6392346dc1677d4898e6d4aa27a9026778e08 Signed-off-by: Juuso Alasuutari <juuso.alasuutari@gmail.com>
imaami · Jun 26, 2021 · ef00cb3 · ef00cb3
1 parent b563731
commit ef00cb3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/dxvk/dxvk_options.cpp b/src/dxvk/dxvk_options.cpp
@@ -3,15 +3,15 @@
 namespace dxvk {
 
   DxvkOptions::DxvkOptions(const Config& config) {
-    enableAsync           = config.getOption<bool>    ("dxvk.enableAsync",            false);
     enableStateCache      = config.getOption<bool>    ("dxvk.enableStateCache",       true);
     enableOpenVR          = config.getOption<bool>    ("dxvk.enableOpenVR",           true);
     enableOpenXR          = config.getOption<bool>    ("dxvk.enableOpenXR",           true);
-    numAsyncThreads       = config.getOption<int32_t> ("dxvk.numAsyncThreads",        0);
     numCompilerThreads    = config.getOption<int32_t> ("dxvk.numCompilerThreads",     0);
     useRawSsbo            = config.getOption<Tristate>("dxvk.useRawSsbo",             Tristate::Auto);
     useEarlyDiscard       = config.getOption<Tristate>("dxvk.useEarlyDiscard",        Tristate::Auto);
     hud                   = config.getOption<std::string>("dxvk.hud", "");
+    enableAsync           = config.getOption<bool>    ("dxvk.enableAsync",            false);
+    numAsyncThreads       = config.getOption<int32_t> ("dxvk.numAsyncThreads",        0);
   }
 
-}
+}
diff --git a/src/dxvk/dxvk_options.h b/src/dxvk/dxvk_options.h
@@ -8,9 +8,6 @@ namespace dxvk {
     DxvkOptions() { }
     DxvkOptions(const Config& config);
 
-    // Enable async pipelines
-    bool enableAsync;
-
     /// Enable state cache
     bool enableStateCache;
 
@@ -20,14 +17,17 @@ namespace dxvk {
     /// Enables OpenXR loading
     bool enableOpenXR;
 
-    /// Number of compiler threads
-    /// when using async pipelines
-    int32_t numAsyncThreads;
-
     /// Number of compiler threads
     /// when using the state cache
     int32_t numCompilerThreads;
 
+    // Enable async pipelines
+    bool enableAsync;
+
+    /// Number of compiler threads
+    /// when using async pipelines
+    int32_t numAsyncThreads;
+
     /// Shader-related options
     Tristate useRawSsbo;
     Tristate useEarlyDiscard;