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

GS/HW: Enable Full mipmap with ps2 trilinear always y default. 

Change mipmap config to bool.
This commit is contained in:
lightningterror 2024-05-12 21:11:23 +02:00
parent 2e882dfabc
commit 115d83a02e
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcsx2/GS/Renderers/HW/GSRendererHW.cpp
View File

@ -16,7 +16,7 @@ GSRendererHW::GSRendererHW()
: GSRenderer() : GSRenderer()
{ {
MULTI_ISA_SELECT(GSRendererHWPopulateFunctions)(*this); MULTI_ISA_SELECT(GSRendererHWPopulateFunctions)(*this);
m_mipmap = (GSConfig.HWMipmap >= HWMipmapLevel::Basic); m_mipmap = GSConfig.HWMipmap;
SetTCOffset(); SetTCOffset();
pxAssert(!g_texture_cache); pxAssert(!g_texture_cache);
@ -88,7 +88,7 @@ void GSRendererHW::Reset(bool hardware_reset)
void GSRendererHW::UpdateSettings(const Pcsx2Config::GSOptions& old_config) void GSRendererHW::UpdateSettings(const Pcsx2Config::GSOptions& old_config)
{ {
GSRenderer::UpdateSettings(old_config); GSRenderer::UpdateSettings(old_config);
m_mipmap = (GSConfig.HWMipmap >= HWMipmapLevel::Basic); m_mipmap = GSConfig.HWMipmap;
SetTCOffset(); SetTCOffset();
} }
@ -2443,7 +2443,7 @@ void GSRendererHW::Draw()
// upload the full chain (with offset) for the hash cache, in case some other texture uses more levels // upload the full chain (with offset) for the hash cache, in case some other texture uses more levels
// for basic mipmapping, we can get away with just doing the base image, since all the mips get generated anyway. // for basic mipmapping, we can get away with just doing the base image, since all the mips get generated anyway.
hash_lod_range = GSVector2i(m_lod.x, (GSConfig.HWMipmap == HWMipmapLevel::Full) ? mxl : m_lod.x); hash_lod_range = GSVector2i(m_lod.x, GSConfig.HWMipmap ? mxl : m_lod.x);
MIP_CLAMP.MINU >>= m_lod.x; MIP_CLAMP.MINU >>= m_lod.x;
MIP_CLAMP.MINV >>= m_lod.x; MIP_CLAMP.MINV >>= m_lod.x;
@ -2538,7 +2538,7 @@ void GSRendererHW::Draw()
else else
{ {
src = tex_psm.depth ? g_texture_cache->LookupDepthSource(true, TEX0, env.TEXA, MIP_CLAMP, tmm.coverage, possible_shuffle, m_vt.IsLinear(), m_cached_ctx.FRAME.Block(), req_color, req_alpha) : src = tex_psm.depth ? g_texture_cache->LookupDepthSource(true, TEX0, env.TEXA, MIP_CLAMP, tmm.coverage, possible_shuffle, m_vt.IsLinear(), m_cached_ctx.FRAME.Block(), req_color, req_alpha) :
g_texture_cache->LookupSource(true, TEX0, env.TEXA, MIP_CLAMP, tmm.coverage, (GSConfig.HWMipmap >= HWMipmapLevel::Basic || GSConfig.TriFilter == TriFiltering::Forced) ? &hash_lod_range : nullptr, g_texture_cache->LookupSource(true, TEX0, env.TEXA, MIP_CLAMP, tmm.coverage, (GSConfig.HWMipmap || GSConfig.TriFilter == TriFiltering::Forced) ? &hash_lod_range : nullptr,
possible_shuffle, m_vt.IsLinear(), m_cached_ctx.FRAME.Block(), req_color, req_alpha); possible_shuffle, m_vt.IsLinear(), m_cached_ctx.FRAME.Block(), req_color, req_alpha);
if (!src) [[unlikely]] if (!src) [[unlikely]]
@ -2821,7 +2821,7 @@ void GSRendererHW::Draw()
} }
// Round 2 // Round 2
if (IsMipMapActive() && GSConfig.HWMipmap == HWMipmapLevel::Full && !tex_psm.depth && !src->m_from_hash_cache) if (IsMipMapActive() && GSConfig.HWMipmap && !tex_psm.depth && !src->m_from_hash_cache)
{ {
// Upload remaining texture layers // Upload remaining texture layers
const GSVector4 tmin = m_vt.m_min.t; const GSVector4 tmin = m_vt.m_min.t;
@ -4649,7 +4649,7 @@ __ri void GSRendererHW::EmulateTextureSampler(const GSTextureCache::Target* rt,
const bool need_mipmap = IsMipMapDraw(); const bool need_mipmap = IsMipMapDraw();
const bool shader_emulated_sampler = tex->m_palette || (tex->m_target && !m_conf.ps.shuffle && cpsm.fmt != 0) || const bool shader_emulated_sampler = tex->m_palette || (tex->m_target && !m_conf.ps.shuffle && cpsm.fmt != 0) ||
complex_wms_wmt || psm.depth || target_region; complex_wms_wmt || psm.depth || target_region;
const bool trilinear_manual = need_mipmap && GSConfig.HWMipmap == HWMipmapLevel::Full; const bool trilinear_manual = need_mipmap && GSConfig.HWMipmap;
bool bilinear = m_vt.IsLinear(); bool bilinear = m_vt.IsLinear();
int trilinear = 0; int trilinear = 0;
@ -4662,22 +4662,22 @@ __ri void GSRendererHW::EmulateTextureSampler(const GSTextureCache::Target* rt,
// We don't need to check for HWMipmapLevel::Off here, because forced trilinear implies forced mipmaps. // We don't need to check for HWMipmapLevel::Off here, because forced trilinear implies forced mipmaps.
bilinear = true; bilinear = true;
trilinear = static_cast<u8>(GS_MIN_FILTER::Linear_Mipmap_Linear); trilinear = static_cast<u8>(GS_MIN_FILTER::Linear_Mipmap_Linear);
trilinear_auto = !tex->m_target && (!need_mipmap || GSConfig.HWMipmap != HWMipmapLevel::Full); trilinear_auto = !tex->m_target && (!need_mipmap || !GSConfig.HWMipmap);
} }
break; break;
case TriFiltering::PS2: case TriFiltering::PS2:
case TriFiltering::Automatic:
{ {
// Can only use PS2 trilinear when mipmapping is enabled. // Can only use PS2 trilinear when mipmapping is enabled.
if (need_mipmap && GSConfig.HWMipmap != HWMipmapLevel::Off) if (need_mipmap && GSConfig.HWMipmap)
{ {
trilinear = m_context->TEX1.MMIN; trilinear = m_context->TEX1.MMIN;
trilinear_auto = !tex->m_target && GSConfig.HWMipmap != HWMipmapLevel::Full; trilinear_auto = !tex->m_target && !GSConfig.HWMipmap;
} }
} }
break; break;
case TriFiltering::Automatic:
case TriFiltering::Off: case TriFiltering::Off:
default: default:
break; break;

4
pcsx2/GS/Renderers/HW/GSTextureCache.cpp
View File

@ -4370,7 +4370,7 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
{ {
// lod won't contain the full range when using basic mipmapping, only that // lod won't contain the full range when using basic mipmapping, only that
// which is hashed, so we just allocate the full thing. // which is hashed, so we just allocate the full thing.
tlevels = (GSConfig.HWMipmap != HWMipmapLevel::Full) ? -1 : std::min(lod->y - lod->x + 1, GSDevice::GetMipmapLevelsForSize(tw, th)); tlevels = GSConfig.HWMipmap ? std::min(lod->y - lod->x + 1, GSDevice::GetMipmapLevelsForSize(tw, th)) : -1;
src->m_lod = *lod; src->m_lod = *lod;
} }
@ -5304,7 +5304,7 @@ GSTextureCache::HashCacheEntry* GSTextureCache::LookupHashCache(const GIFRegTEX0
// expand/upload texture // expand/upload texture
const int tw = region.HasX() ? region.GetWidth() : (1 << TEX0.TW); const int tw = region.HasX() ? region.GetWidth() : (1 << TEX0.TW);
const int th = region.HasY() ? region.GetHeight() : (1 << TEX0.TH); const int th = region.HasY() ? region.GetHeight() : (1 << TEX0.TH);
const int tlevels = lod ? ((GSConfig.HWMipmap != HWMipmapLevel::Full) ? -1 : std::min(lod->y - lod->x + 1, GSDevice::GetMipmapLevelsForSize(tw, th))) : 1; const int tlevels = lod ? (GSConfig.HWMipmap ? std::min(lod->y - lod->x + 1, GSDevice::GetMipmapLevelsForSize(tw, th)) : -1) : 1;
GSTexture* tex = g_gs_device->CreateTexture(tw, th, tlevels, paltex ? GSTexture::Format::UNorm8 : GSTexture::Format::Color); GSTexture* tex = g_gs_device->CreateTexture(tw, th, tlevels, paltex ? GSTexture::Format::UNorm8 : GSTexture::Format::Color);
if (!tex) if (!tex)
{ {

3
pcsx2/GS/Renderers/HW/GSTextureReplacements.cpp
View File

@ -661,8 +661,7 @@ void GSTextureReplacements::PrecacheReplacementTextures()
// predict whether the requests will come with mipmaps // predict whether the requests will come with mipmaps
// TODO: This will be wrong for hw mipmap games like Jak. // TODO: This will be wrong for hw mipmap games like Jak.
const bool mipmap = GSConfig.HWMipmap >= HWMipmapLevel::Basic || const bool mipmap = GSConfig.HWMipmap || GSConfig.TriFilter == TriFiltering::Forced;
GSConfig.TriFilter == TriFiltering::Forced;
// pretty simple, just go through the filenames and if any aren't cached, cache them // pretty simple, just go through the filenames and if any aren't cached, cache them
for (const auto& it : s_replacement_texture_filenames) for (const auto& it : s_replacement_texture_filenames)