Also move video filtering override.

This commit is contained in:
Henrik Rydgård 2020-09-14 00:00:52 +02:00
parent 0e464a61e0
commit f3ce685b0e

View file

@ -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: