Merge pull request #14336 from SuperSamus/arbitrary-mipmap-disables-gpu-decoding

VideoCommon: Invert interaction between Arbitrary Mipmap Detection and GPU Texture Decoding (the former disables the latter)

8 files changed, 3 insertions, 41 deletions

diff --git a/Data/Sys/GameSettings/DAX.ini b/Data/Sys/GameSettings/DAX.ini
index a6e6b366cf..6fea79b0a9 100644
--- a/Data/Sys/GameSettings/DAX.ini
+++ b/Data/Sys/GameSettings/DAX.ini
@@ -15,8 +15,3 @@ EFBEmulateFormatChanges = True
 
 [Video_Enhancements]
 ArbitraryMipmapDetection = True
-
-[Video_Settings]
-# Allow the ArbitraryMipmapDetection setting to take effect.
-
-EnableGPUTextureDecoding = False
diff --git a/Data/Sys/GameSettings/GMS.ini b/Data/Sys/GameSettings/GMS.ini
index 162644b033..a03c122b36 100644
--- a/Data/Sys/GameSettings/GMS.ini
+++ b/Data/Sys/GameSettings/GMS.ini
@@ -21,10 +21,5 @@ MissingColorValue = 0x00000000
 ForceTextureFiltering = 0
 ArbitraryMipmapDetection = True
 
-[Video_Settings]
-# Allow the ArbitraryMipmapDetection setting to take effect.
-
-EnableGPUTextureDecoding = False
-
 [Video_Stereoscopy]
 StereoConvergence = 732
diff --git a/Data/Sys/GameSettings/GZ2.ini b/Data/Sys/GameSettings/GZ2.ini
index 9261767b41..b592e7f328 100644
--- a/Data/Sys/GameSettings/GZ2.ini
+++ b/Data/Sys/GameSettings/GZ2.ini
@@ -10,7 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
-# The game logic itself is ignoring VI interrupts 
+# The game logic itself is ignoring VI interrupts
 # and keeps updating shadow video registers.
 # Because of this, it is incompatible with VISkip.
 
@@ -23,9 +23,5 @@ VISkip = False
 
 CPUCull = True
 
-# Allow the ArbitraryMipmapDetection setting to take effect.
-
-EnableGPUTextureDecoding = False
-
 [Video_Enhancements]
 ArbitraryMipmapDetection = True
diff --git a/Data/Sys/GameSettings/GZL.ini b/Data/Sys/GameSettings/GZL.ini
index 5ffac0d340..4203954e72 100644
--- a/Data/Sys/GameSettings/GZL.ini
+++ b/Data/Sys/GameSettings/GZL.ini
@@ -13,7 +13,7 @@
 EFBAccessEnable = True
 EFBToTextureEnable = False
 
-# The game logic itself is ignoring VI interrupts 
+# The game logic itself is ignoring VI interrupts
 # and keeps updating shadow video registers.
 # Because of this, it is incompatible with VISkip.
 
@@ -24,8 +24,3 @@ ArbitraryMipmapDetection = True
 
 [Video_Stereoscopy]
 StereoConvergence = 115
-
-[Video_Settings]
-# Allow the ArbitraryMipmapDetection setting to take effect.
-
-EnableGPUTextureDecoding = False
diff --git a/Data/Sys/GameSettings/RMG.ini b/Data/Sys/GameSettings/RMG.ini
index c3175c8489..34ff3120ca 100644
--- a/Data/Sys/GameSettings/RMG.ini
+++ b/Data/Sys/GameSettings/RMG.ini
@@ -15,8 +15,3 @@ EFBAccessDeferInvalidation = True
 
 [Video_Enhancements]
 ArbitraryMipmapDetection = True
-
-[Video_Settings]
-# Allow the ArbitraryMipmapDetection setting to take effect.
-
-EnableGPUTextureDecoding = False
diff --git a/Data/Sys/GameSettings/RZD.ini b/Data/Sys/GameSettings/RZD.ini
index 424edfcfc1..da85a72312 100644
--- a/Data/Sys/GameSettings/RZD.ini
+++ b/Data/Sys/GameSettings/RZD.ini
@@ -12,7 +12,7 @@
 [Video_Hacks]
 EFBAccessEnable = True
 
-# The game logic itself is ignoring VI interrupts 
+# The game logic itself is ignoring VI interrupts
 # and keeps updating shadow video registers.
 # Because of this, it is incompatible with VISkip.
 
@@ -25,9 +25,5 @@ VISkip = False
 
 CPUCull = True
 
-# Allow the ArbitraryMipmapDetection setting to take effect.
-
-EnableGPUTextureDecoding = False
-
 [Video_Enhancements]
 ArbitraryMipmapDetection = True
diff --git a/Data/Sys/GameSettings/SB4.ini b/Data/Sys/GameSettings/SB4.ini
index a224a6cec7..0305e9c610 100644
--- a/Data/Sys/GameSettings/SB4.ini
+++ b/Data/Sys/GameSettings/SB4.ini
@@ -17,8 +17,3 @@ ArbitraryMipmapDetection = True
 
 [Video_Stereoscopy]
 StereoConvergence = 929
-
-[Video_Settings]
-# Allow the ArbitraryMipmapDetection setting to take effect.
-
-EnableGPUTextureDecoding = False
diff --git a/Data/Sys/GameSettings/SOU.ini b/Data/Sys/GameSettings/SOU.ini
index 4c56a0aedb..16d6adccc0 100644
--- a/Data/Sys/GameSettings/SOU.ini
+++ b/Data/Sys/GameSettings/SOU.ini
@@ -13,8 +13,3 @@ EFBEmulateFormatChanges = True
 
 [Video_Enhancements]
 ArbitraryMipmapDetection = True
-
-[Video_Settings]
-# Allow the ArbitraryMipmapDetection setting to take effect.
-
-EnableGPUTextureDecoding = False