From c9a0f06ff49f00413d0bb2809ccded0e369e3776 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Thu, 19 Sep 2019 20:51:05 +0200
Subject: [PATCH] [d3d11] Enable allowMapFlagNoWait by default

We still keep the option around so that in case of regressions,
users can check if disabling this option fixes their issue.
---
 src/d3d11/d3d11_options.cpp |  2 +-
 src/util/config/config.cpp  | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/d3d11/d3d11_options.cpp b/src/d3d11/d3d11_options.cpp
index 21a33a11..6f5e3ed3 100644
--- a/src/d3d11/d3d11_options.cpp
+++ b/src/d3d11/d3d11_options.cpp
@@ -5,7 +5,7 @@
 namespace dxvk {
   
   D3D11Options::D3D11Options(const Config& config) {
-    this->allowMapFlagNoWait    = config.getOption<bool>("d3d11.allowMapFlagNoWait", false);
+    this->allowMapFlagNoWait    = config.getOption<bool>("d3d11.allowMapFlagNoWait", true);
     this->dcSingleUseMode       = config.getOption<bool>("d3d11.dcSingleUseMode", true);
     this->strictDivision           = config.getOption<bool>("d3d11.strictDivision", false);
     this->constantBufferRangeCheck = config.getOption<bool>("d3d11.constantBufferRangeCheck", false);
diff --git a/src/util/config/config.cpp b/src/util/config/config.cpp
index 6df8b705..da1386dd 100644
--- a/src/util/config/config.cpp
+++ b/src/util/config/config.cpp
@@ -12,18 +12,10 @@
 namespace dxvk {
 
   const static std::vector<std::pair<const char*, Config>> g_appDefaults = {{
-    /* Anno 1800                                  */
-    { R"(\\Anno1800\.exe$)", {{
-      { "d3d11.allowMapFlagNoWait",         "True" }
-    }} },
     /* Assassin's Creed Syndicate: amdags issues  */
     { R"(\\ACS\.exe$)", {{
       { "dxgi.customVendorId",              "10de" },
     }} },
-    /* Dishonored 2                               */
-    { R"(\\Dishonored2\.exe$)", {{
-      { "d3d11.allowMapFlagNoWait",         "True" }
-    }} },
     /* Dissidia Final Fantasy NT Free Edition */
     { R"(\\dffnt\.exe$)", {{
       { "dxgi.deferSurfaceCreation",        "True" },
@@ -53,10 +45,6 @@ namespace dxvk {
     { R"(\\FarCry4\.exe$)", {{
       { "dxgi.nvapiHack",                   "False" },
     }} },
-    /* Far Cry 5: Avoid CPU <-> GPU sync          */
-    { R"(\\FarCry5\.exe$)", {{
-      { "d3d11.allowMapFlagNoWait",         "True" }
-    }} },
     /* Far Cry Primal: Nvidia performance         */
     { R"(\\FCPrimal\.exe$)", {{
       { "dxgi.nvapiHack",                   "False" },
@@ -132,22 +120,10 @@ namespace dxvk {
     { R"(\\NieRAutomata\.exe$)", {{
       { "d3d11.constantBufferRangeCheck",   "True" },
     }} },
-    /* The Surge                                  */
-    { R"(\\TheSurge\.exe$)", {{
-      { "d3d11.allowMapFlagNoWait",         "True" },
-    }} },
     /* SteamVR performance test                   */
     { R"(\\vr\.exe$)", {{
       { "d3d11.dcSingleUseMode",            "False" },
     }} },
-    /* Control                                    */
-    { R"(\\Control_DX11\.exe$)", {{
-      { "d3d11.allowMapFlagNoWait",         "True" }
-    }} },
-    /* Warhammer 2                                */
-    { R"(\\Warhammer2\.exe$)", {{
-      { "d3d11.allowMapFlagNoWait",         "True" }
-    }} },
   }};