Compat: Remove DisableRangeCulling.

This hack was used because culling previously incorrectly handled Z, which was fixed in hrydgard#14833.
unknownbrackets · Oct 5, 2022 · f24edbe · f24edbe
1 parent 8025def
commit f24edbe
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 90 deletions.
diff --git a/Core/Compatibility.cpp b/Core/Compatibility.cpp
@@ -97,7 +97,6 @@ void Compatibility::CheckSettings(IniFile &iniFile, const std::string &gameID) {
 	CheckSetting(iniFile, gameID, "DateLimited", &flags_.DateLimited);
 	CheckSetting(iniFile, gameID, "ShaderColorBitmask", &flags_.ShaderColorBitmask);
 	CheckSetting(iniFile, gameID, "DisableFirstFrameReadback", &flags_.DisableFirstFrameReadback);
-	CheckSetting(iniFile, gameID, "DisableRangeCulling", &flags_.DisableRangeCulling);
 	CheckSetting(iniFile, gameID, "MpegAvcWarmUp", &flags_.MpegAvcWarmUp);
 	CheckSetting(iniFile, gameID, "BlueToAlpha", &flags_.BlueToAlpha);
 	CheckSetting(iniFile, gameID, "CenteredLines", &flags_.CenteredLines);

diff --git a/Core/Compatibility.h b/Core/Compatibility.h
@@ -77,7 +77,6 @@ struct CompatFlags {
 	bool DateLimited;
 	bool ShaderColorBitmask;
 	bool DisableFirstFrameReadback;
-	bool DisableRangeCulling;
 	bool MpegAvcWarmUp;
 	bool BlueToAlpha;
 	bool CenteredLines;

diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp
@@ -3309,11 +3309,7 @@ u32 GPUCommon::CheckGPUFeatures() const {
 	}
 
 	if (!draw_->GetBugs().Has(Draw::Bugs::BROKEN_NAN_IN_CONDITIONAL)) {
-		// Ignore the compat setting if clip and cull are both enabled.
-		// When supported, we can do the depth side of range culling more correctly.
-		const bool supported = draw_->GetDeviceCaps().clipDistanceSupported && draw_->GetDeviceCaps().cullDistanceSupported;
-		const bool disabled = PSP_CoreParameter().compat.flags().DisableRangeCulling;
-		if (supported || !disabled) {
+		if (draw_->GetDeviceCaps().clipDistanceSupported && draw_->GetDeviceCaps().cullDistanceSupported) {
 			features |= GPU_SUPPORTS_VS_RANGE_CULLING;
 		}
 	}

diff --git a/assets/compat.ini b/assets/compat.ini
@@ -156,89 +156,6 @@ NPJH90062 = true
 # Phantasy Star Portable Infinity Demo
 NPJH90157 = true  # Infinity demo
 
-[DisableRangeCulling]
-# Phantasy Star games also have range culling issues.
-# Phantasy Star Portable 2 and Infinity
-ULJM05309 = true
-ULUS10410 = true
-ULES01218 = true
-ULJM08023 = true
-ULES01218 = true
-# Phantasy Star Portable 1 Demo
-NPUH90023 = true
-# Phantasy Star Portable 2
-ULES01439 = true
-ULUS10529 = true
-ULJM05493 = true
-NPJH50043 = true
-ULJM08030 = true
-NPUH90023 = true
-ULJM91014 = true
-NPJH90002 = true
-ULJM05732 = true
-NPJH50332 = true
-# Phantasy Star Portable 2 JP Demo
-ULJM91018 = true
-NPJH90062 = true
-# Phantasy Star Portable Infinity Demo
-NPJH90157 = true  # Infinity demo
-
-# Test Drive Unlimited
-ULET00386 = true
-ULES00637 = true
-ULKS46126 = true
-ULUS10249 = true
-
-# Metal Gear Solid : Peace Walker (see issue #12348)
-ULUS10509 = true
-ULES01372 = true
-ULJM08038 = true
-NPJH50045 = true
-ULJM05630 = true
-NPJH90082 = true
-NPJH90063 = true
-
-# Metal Gear Solid : Peace Walker Demo Ops (see issue #12348)
-NPUH90066 = true
-NPHH00145 = true
-NPEH90023 = true
-
-# Metal Gear Solid: Portable Ops (see issue #12348)
-ULES00645 = true
-ULJM05193 = true
-ULJM05227 = true
-ULUS10202 = true
-ULES01003 = true
-ULJM05261 = true
-ULUS10290 = true
-ULED90040 = true
-ULJM05284 = true
-ULES00645 = true
-
-# Splinter Cell Essentials (#13035)
-ULES00281 = true
-ULUS10070 = true
-
-# Asphalt 2 (#14299)
-ULES00719 = true
-# No US release, it seems
-
-# Star Wars: Lethal Alliance (#11551)
-ULES00599 = true
-ULUS10188 = true
-
-# Digimon World Re:Digitize
-ULJS00496 = true
-NPJH50588 = true
-ULAS42319 = true
-
-# NOVA: Near Orbit Vanguard Alliance
-NPUZ00179 = true
-NPEZ00222 = true
-
-# Street Riders (only region found. See #14746)
-ULES00276 = true
-
 [ClearToRAM]
 # SOCOM Navy Seals games require this. See issue #8973.
 # Navy Seals : Tactical Strike