diff --git a/Core/FileSystems/MetaFileSystem.cpp b/Core/FileSystems/MetaFileSystem.cpp index 49ddcc892b..b7c6f6094a 100644 --- a/Core/FileSystems/MetaFileSystem.cpp +++ b/Core/FileSystems/MetaFileSystem.cpp @@ -79,7 +79,6 @@ static bool RealPath(const std::string ¤tDirectory, const std::string &inP size_t inLen = inPath.length(); if (inLen == 0) { - WARN_LOG(FILESYS, "RealPath: inPath is empty"); outPath = currentDirectory; return true; } diff --git a/GPU/Common/TextureReplacer.cpp b/GPU/Common/TextureReplacer.cpp index 432cf51c07..a67a992968 100644 --- a/GPU/Common/TextureReplacer.cpp +++ b/GPU/Common/TextureReplacer.cpp @@ -904,12 +904,14 @@ bool TextureReplacer::GenerateIni(const std::string &gameID, Path &generatedFile // Let's also write some defaults. fprintf(f, R"(# This file is optional and describes your textures. -# Some information on syntax available here: -# https://github.com/hrydgard/ppsspp/wiki/Texture-replacement-ini-syntax +# Documentation about the options and syntax is available here: +# https://www.ppsspp.org/docs/reference/texture-replacement [options] version = 1 hash = quick -ignoreMipmap = false +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. +allowVideo = false [games] # Used to make it easier to install, and override settings for other regions. @@ -921,8 +923,11 @@ ignoreMipmap = false # See wiki for more info. [hashranges] +# See the documentation. +# Example: 08b31020,512,512 = 480,272 [filtering] +# You can enforce specific filtering modes with this. See the docs. [reducehashranges] )", gameID.c_str(), INI_FILENAME.c_str()); diff --git a/GPU/Common/TextureReplacer.h b/GPU/Common/TextureReplacer.h index 5b1f962663..bd6dd29807 100644 --- a/GPU/Common/TextureReplacer.h +++ b/GPU/Common/TextureReplacer.h @@ -138,11 +138,12 @@ protected: bool allowVideo_ = false; bool ignoreAddress_ = false; bool reduceHash_ = false; + bool ignoreMipmap_ = false; + float reduceHashSize = 1.0f; // default value with reduceHash to false float reduceHashGlobalValue = 0.5f; // Global value for textures dump pngs of all sizes, 0.5 by default but can be set in textures.ini double lastTextureCacheSizeGB_ = 0.0; - bool ignoreMipmap_ = false; std::string gameID_; Path basePath_; Path newTextureDir_; @@ -150,6 +151,7 @@ protected: VFSBackend *vfs_ = nullptr; bool vfsIsZip_ = false; + GPUFormatSupport formatSupport_{}; typedef std::pair WidthHeightPair;