Merge pull request #17144 from hrydgard/replacement-force-mipmaps

Force mipmapping on when drawing using replacement textures that contain mipmaps
hrydgard · Mar 18, 2023 · 37c1e17 · 37c1e17
2 parents e6ceaa5 + baf8cbf
commit 37c1e17
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp
@@ -252,7 +252,15 @@ SamplerCacheKey TextureCacheCommon::GetSamplingParams(int maxLevel, const TexCac
 
 	// Filtering overrides from replacements or settings.
 	TextureFiltering forceFiltering = TEX_FILTER_AUTO;
-	bool useReplacerFiltering = entry && replacer_.Enabled() && entry->replacedTexture && entry->replacedTexture->ForceFiltering(&forceFiltering);
+	bool useReplacerFiltering = false;
+	if (entry && replacer_.Enabled() && entry->replacedTexture && entry->replacedTexture->State() == ReplacementState::ACTIVE) {
+		// If replacement textures have multiple mip levels, enforce mip filtering.
+		if (entry->replacedTexture->NumLevels() > 1) {
+			key.mipFilt = 1;
+			key.maxLevel = 9 * 256;
+		}
+		useReplacerFiltering = entry->replacedTexture->ForceFiltering(&forceFiltering);
+	}
 	if (!useReplacerFiltering) {
 		switch (g_Config.iTexFiltering) {
 		case TEX_FILTER_AUTO:

diff --git a/GPU/Common/TextureReplacer.cpp b/GPU/Common/TextureReplacer.cpp
@@ -909,14 +909,15 @@ bool TextureReplacer::GenerateIni(const std::string &gameID, Path &generatedFile
 		fwrite("\xEF\xBB\xBF", 1, 3, f);
 
 		// Let's also write some defaults.
-		fprintf(f, R"(# This file is optional and describes your textures.
+		fprintf(f, R"(# This describes your textures and set up options for texture replacement.
 # Documentation about the options and syntax is available here:
 # https://www.ppsspp.org/docs/reference/texture-replacement
+
 [options]
 version = 1
 hash = quick
-ignoreMipmap = false  # Set to true to avoid dumping mipmaps. Instead use basisu to generate them, see docs.
-reduceHash = false  # Usually a good idea to use.
+ignoreMipmap = true  # Set to true to avoid dumping mipmaps. Instead use basisu to generate them, see docs.
+reduceHash = false
 allowVideo = false
 
 [games]
@@ -933,9 +934,11 @@ allowVideo = false
 # Example: 08b31020,512,512 = 480,272
 
 [filtering]
-# You can enforce specific filtering modes with this. See the docs.
+# You can enforce specific filtering modes with this. Available modes are linear/nearest/auto. See the docs.
+# Example: 08d3961000000909ba70b2af = linear
 
 [reducehashranges]
+# Lets you set regions of memory where reduced hashing applies. See the docs.
 )", gameID.c_str(), INI_FILENAME.c_str());
 		fclose(f);
 	}