ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Config: Change hw mipmap from enum to bool.

This commit is contained in:
lightningterror 2024-05-16 16:00:06 +02:00
parent 8d3617bb71
commit 06efa93070
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcsx2/Config.h
View File

@ -286,14 +286,6 @@ enum class TriFiltering : s8
Forced, Forced,
}; };
enum class HWMipmapLevel : s8
{
Automatic = -1,
Off,
Basic,
Full
};
enum class AccBlendLevel : u8 enum class AccBlendLevel : u8
{ {
Minimum, Minimum,
@ -620,6 +612,7 @@ struct Pcsx2Config
AutoFlushSW : 1, AutoFlushSW : 1,
PreloadFrameWithGSData : 1, PreloadFrameWithGSData : 1,
Mipmap : 1, Mipmap : 1,
HWMipmap : 1,
ManualUserHacks : 1, ManualUserHacks : 1,
UserHacks_AlignSpriteX : 1, UserHacks_AlignSpriteX : 1,
UserHacks_CPUFBConversion : 1, UserHacks_CPUFBConversion : 1,
@ -673,7 +666,6 @@ struct Pcsx2Config
GSRendererType Renderer = GSRendererType::Auto; GSRendererType Renderer = GSRendererType::Auto;
float UpscaleMultiplier = 1.0f; float UpscaleMultiplier = 1.0f;
HWMipmapLevel HWMipmap = HWMipmapLevel::Automatic;
AccBlendLevel AccurateBlendingUnit = AccBlendLevel::Basic; AccBlendLevel AccurateBlendingUnit = AccBlendLevel::Basic;
BiFiltering TextureFiltering = BiFiltering::PS2; BiFiltering TextureFiltering = BiFiltering::PS2;
TexturePreloadingLevel TexturePreloading = TexturePreloadingLevel::Full; TexturePreloadingLevel TexturePreloading = TexturePreloadingLevel::Full;

4
pcsx2/Pcsx2Config.cpp
View File

@ -642,6 +642,7 @@ Pcsx2Config::GSOptions::GSOptions()
AutoFlushSW = true; AutoFlushSW = true;
PreloadFrameWithGSData = false; PreloadFrameWithGSData = false;
Mipmap = true; Mipmap = true;
HWMipmap = true;
ManualUserHacks = false; ManualUserHacks = false;
UserHacks_AlignSpriteX = false; UserHacks_AlignSpriteX = false;
@ -708,7 +709,6 @@ bool Pcsx2Config::GSOptions::OptionsAreEqual(const GSOptions& right) const
OpEqu(Renderer) && OpEqu(Renderer) &&
OpEqu(UpscaleMultiplier) && OpEqu(UpscaleMultiplier) &&
OpEqu(HWMipmap) &&
OpEqu(AccurateBlendingUnit) && OpEqu(AccurateBlendingUnit) &&
OpEqu(TextureFiltering) && OpEqu(TextureFiltering) &&
OpEqu(TexturePreloading) && OpEqu(TexturePreloading) &&
@ -893,7 +893,7 @@ void Pcsx2Config::GSOptions::LoadSave(SettingsWrapper& wrap)
// ~51x would the upper bound here for 32768x32768 textures, but you'll run out VRAM long before then. // ~51x would the upper bound here for 32768x32768 textures, but you'll run out VRAM long before then.
UpscaleMultiplier = std::clamp(UpscaleMultiplier, 0.5f, 50.0f); UpscaleMultiplier = std::clamp(UpscaleMultiplier, 0.5f, 50.0f);
SettingsWrapIntEnumEx(HWMipmap, "mipmap_hw"); SettingsWrapBitBoolEx(HWMipmap, "hw_mipmap");
SettingsWrapIntEnumEx(AccurateBlendingUnit, "accurate_blending_unit"); SettingsWrapIntEnumEx(AccurateBlendingUnit, "accurate_blending_unit");
SettingsWrapIntEnumEx(TextureFiltering, "filter"); SettingsWrapIntEnumEx(TextureFiltering, "filter");
SettingsWrapIntEnumEx(TexturePreloading, "texture_preloading"); SettingsWrapIntEnumEx(TexturePreloading, "texture_preloading");