Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use "Undesired" scale mode for certain textures rather than blacklisting (#2537)

Browse source 
* Use "Undesired" scale mode for certain textures rather than blacklisting

* Nit

Co-authored-by: gdkchan <gab.dark.100@gmail.com>

Co-authored-by: gdkchan <gab.dark.100@gmail.com>
This commit is contained in:
riperiperi 2021-08-11 21:44:51 +01:00 • committed by GitHub
parent ed754af8d5
commit 0a80a837cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 53 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Ryujinx.Graphics.Gpu/Image/TextureManager.cs
View file

@ -140,6 +140,16 @@ namespace Ryujinx.Graphics.Gpu.Image
_gpBindingsManager.SetTexturePool(gpuVa, maximumId);
}
/// <summary>
/// Check if a texture's scale must be updated to match the configured resolution scale.
/// </summary>
/// <param name="texture">The texture to check</param>
/// <returns>True if the scale needs updating, false if the scale is up to date</returns>
private bool ScaleNeedsUpdated(Texture texture)
{
return texture != null && !(texture.ScaleMode == TextureScaleMode.Blacklisted || texture.ScaleMode == TextureScaleMode.Undesired) && texture.ScaleFactor != GraphicsConfig.ResScale;
}
/// <summary>
/// Sets the render target color buffer.
/// </summary>
@ -164,7 +174,7 @@ namespace Ryujinx.Graphics.Gpu.Image
_rtColors[index] = color;
}
return changesScale || (hasValue && color.ScaleMode != TextureScaleMode.Blacklisted && color.ScaleFactor != GraphicsConfig.ResScale);
return changesScale || ScaleNeedsUpdated(color);
}
/// <summary>
@ -190,7 +200,7 @@ namespace Ryujinx.Graphics.Gpu.Image
_rtDepthStencil = depthStencil;
}
return changesScale || (hasValue && depthStencil.ScaleMode != TextureScaleMode.Blacklisted && depthStencil.ScaleFactor != GraphicsConfig.ResScale);
return changesScale || ScaleNeedsUpdated(depthStencil);
}
/// <summary>
@ -214,6 +224,7 @@ namespace Ryujinx.Graphics.Gpu.Image
bool mismatch = false;
bool blacklisted = false;
bool hasUpscaled = false;
bool hasUndesired = false;
float targetScale = GraphicsConfig.ResScale;
void ConsiderTarget(Texture target)
@ -230,9 +241,13 @@ namespace Ryujinx.Graphics.Gpu.Image
case TextureScaleMode.Eligible:
mismatch = true; // We must make a decision.
break;
case TextureScaleMode.Undesired:
hasUndesired = true;
mismatch |= scale != 1f || hasUpscaled; // If another target is upscaled, scale this one up too.
break;
case TextureScaleMode.Scaled:
hasUpscaled = true;
mismatch |= scale != targetScale; // If the target scale has changed, reset the scale for all targets.
mismatch |= hasUndesired || scale != targetScale; // If the target scale has changed, reset the scale for all targets.
break;
}
}
@ -254,7 +269,7 @@ namespace Ryujinx.Graphics.Gpu.Image
mismatch |= blacklisted && hasUpscaled;
if (blacklisted)
if (blacklisted || (hasUndesired && !hasUpscaled))
{
targetScale = 1f;
}