From f3ce685b0e2bdb48403d5b0207aefbc3ca910cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Mon, 14 Sep 2020 00:00:52 +0200 Subject: [PATCH] Also move video filtering override. --- GPU/Common/TextureCacheCommon.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index a37d5fecb9..2ae3adc900 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -176,13 +176,6 @@ SamplerCacheKey TextureCacheCommon::GetSamplingParams(int maxLevel, u32 texAddr) lodBias = 0.0f; } - if (!(magFilt & 1) && texAddr != 0 && g_Config.iTexFiltering != TEX_FILTER_FORCE_NEAREST) { - if (videos_.find(texAddr & 0x3FFFFFFF) != videos_.end()) { - // Enforce bilinear filtering on magnification. - magFilt |= 1; - } - } - key.minFilt = minFilt & 1; key.mipEnable = (minFilt >> 2) & 1; key.mipFilt = (minFilt >> 1) & 1; @@ -223,6 +216,14 @@ SamplerCacheKey TextureCacheCommon::GetSamplingParams(int maxLevel, u32 texAddr) } } + // Video bilinear override + if (!key.magFilt && texAddr != 0) { + if (videos_.find(texAddr & 0x3FFFFFFF) != videos_.end()) { + // Enforce bilinear filtering on magnification. + key.magFilt = 1; + } + } + // Filtering overrides switch (g_Config.iTexFiltering) { case TEX_FILTER_AUTO: