From 8de9dc93781b61a902a2dc15cc4192514a821237 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Thu, 28 Jan 2021 20:09:10 +0100
Subject: [PATCH] [d3d11] Enable d3d11.invariantPosition by default

---
 dxvk.conf                   |  2 +-
 src/d3d11/d3d11_options.cpp |  2 +-
 src/util/config/config.cpp  | 29 +++++------------------------
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/dxvk.conf b/dxvk.conf
index 9ca21a5e..1cd42564 100644
--- a/dxvk.conf
+++ b/dxvk.conf
@@ -146,7 +146,7 @@
 #
 # Supported values: True, False
 
-# d3d11.invariantPosition = False
+# d3d11.invariantPosition = True
 # d3d9.invariantPosition = False
 
 
diff --git a/src/d3d11/d3d11_options.cpp b/src/d3d11/d3d11_options.cpp
index f3310b42..0922b2db 100644
--- a/src/d3d11/d3d11_options.cpp
+++ b/src/d3d11/d3d11_options.cpp
@@ -14,7 +14,7 @@ namespace dxvk {
     this->relaxedBarriers       = config.getOption<bool>("d3d11.relaxedBarriers", false);
     this->maxTessFactor         = config.getOption<int32_t>("d3d11.maxTessFactor", 0);
     this->samplerAnisotropy     = config.getOption<int32_t>("d3d11.samplerAnisotropy", -1);
-    this->invariantPosition     = config.getOption<bool>("d3d11.invariantPosition", false);
+    this->invariantPosition     = config.getOption<bool>("d3d11.invariantPosition", true);
     this->deferSurfaceCreation  = config.getOption<bool>("dxgi.deferSurfaceCreation", false);
     this->numBackBuffers        = config.getOption<int32_t>("dxgi.numBackBuffers", 0);
     this->maxFrameLatency       = config.getOption<int32_t>("dxgi.maxFrameLatency", 0);
diff --git a/src/util/config/config.cpp b/src/util/config/config.cpp
index 7790a855..bbf995d6 100644
--- a/src/util/config/config.cpp
+++ b/src/util/config/config.cpp
@@ -79,7 +79,6 @@ namespace dxvk {
     /* Devil May Cry 5                            */
     { R"(\\DevilMayCry5\.exe$)", {{
       { "d3d11.relaxedBarriers",            "True" },
-      { "d3d11.invariantPosition",          "True" },
     }} },
     /* Call of Duty WW2                           */
     { R"(\\s2_sp64_ship\.exe$)", {{
@@ -132,12 +131,10 @@ namespace dxvk {
     /* Saints Row IV                              */
     { R"(\\SaintsRowIV\.exe$)", {{
       { "d3d11.constantBufferRangeCheck",   "True" },
-      { "d3d11.invariantPosition",          "True" },
     }} },
     /* Saints Row: The Third                      */
     { R"(\\SaintsRowTheThird_DX11\.exe$)", {{
       { "d3d11.constantBufferRangeCheck",   "True" },
-      { "d3d11.invariantPosition",          "True" },
     }} },
     /* Metal Gear Solid 5                         */
     { R"(\\mgsvtpp\.exe$)", {{
@@ -173,10 +170,6 @@ namespace dxvk {
     { R"(\\starwarsbattlefrontii\.exe$)", {{
       { "dxgi.customVendorId",              "10de" },
     }} },
-    /* Entropia Universe                          */
-    { R"(\\Entropia\.exe$)", {{
-      { "d3d11.invariantPosition",          "True" },
-    }} },
     /* F1 games - do not synchronize TGSM access  *
      * in a compute shader, causing artifacts     */
     { R"(\\F1_20(1[89]|[2-9][0-9])\.exe$)", {{
@@ -194,22 +187,6 @@ namespace dxvk {
     { R"(\\SecretWorldLegendsDX11\.exe$)", {{
       { "d3d11.constantBufferRangeCheck",   "True" },
     }} },
-    /* Borderlands 3                              */
-    { R"(\\Borderlands3\.exe$)", {{
-      { "d3d11.invariantPosition",          "True" },
-    }} },
-    /* Terminator: Resistance                     */
-    { R"(\\Terminator-Win64-Shipping\.exe$)", {{
-      { "d3d11.invariantPosition",          "True" },
-    }} },
-    /* Star Wars Jedi: Fallen Order               */
-    { R"(\\starwarsjedifallenorder\.exe$)", {{
-      { "d3d11.invariantPosition",          "True" },
-    }} },
-    /* Mafia III: Definitive Edition              */
-    { R"(\\Mafia3DefinitiveEdition\.exe$)", {{
-      { "d3d11.invariantPosition",          "True" },
-    }} },
     /* Darksiders Warmastered - apparently reads  *
      * from write-only mapped buffers             */
     { R"(\\darksiders1\.exe$)", {{
@@ -218,7 +195,11 @@ namespace dxvk {
     /* Monster Hunter World                       */
     { R"(\\MonsterHunterWorld\.exe$)", {{
       { "d3d11.apitraceMode",               "True" },
-      { "d3d11.invariantPosition",          "True" },
+    }} },
+    /* Shadow of the Tomb Raider - invariant      *
+     * position breaks character rendering on NV  */
+    { R"(\\SOTTR\.exe$)", {{
+      { "d3d11.invariantPosition",          "False" },
     }} },
 
     /**********************************************/