From 484eb645ae0611f60fae845ed011ed6115352e06 Mon Sep 17 00:00:00 2001 From: riperiperi Date: Tue, 7 Jul 2020 03:41:07 +0100 Subject: Implement Zero-Configuration Resolution Scaling (#1365) * Initial implementation of Render Target Scaling Works with most games I have. No GUI option right now, it is hardcoded. Missing handling for texelFetch operation. * Realtime Configuration, refactoring. * texelFetch scaling on fragment shader (WIP) * Improve Shader-Side changes. * Fix potential crash when no color/depth bound * Workaround random uses of textures in compute. This was blacklisting textures in a few games despite causing no bugs. Will eventually add full support so this doesn't break anything. * Fix scales oscillating when changing between non-native scales. * Scaled textures on compute, cleanup, lazier uniform update. * Cleanup. * Fix stupidity * Address Thog Feedback. * Cover most of GDK's feedback (two comments remain) * Fix bad rename * Move IsDepthStencil to FormatExtensions, add docs. * Fix default config, square texture detection. * Three final fixes: - Nearest copy when texture is integer format. - Texture2D -> Texture3D copy correctly blacklists the texture before trying an unscaled copy (caused driver error) - Discount small textures. * Remove scale threshold. Not needed right now - we'll see if we run into problems. * All CPU modification blacklists scale. * Fix comment. --- Ryujinx.Graphics.OpenGL/Image/TextureCopyUnscaled.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Ryujinx.Graphics.OpenGL/Image/TextureCopyUnscaled.cs') diff --git a/Ryujinx.Graphics.OpenGL/Image/TextureCopyUnscaled.cs b/Ryujinx.Graphics.OpenGL/Image/TextureCopyUnscaled.cs index 28401138..02ae3b58 100644 --- a/Ryujinx.Graphics.OpenGL/Image/TextureCopyUnscaled.cs +++ b/Ryujinx.Graphics.OpenGL/Image/TextureCopyUnscaled.cs @@ -15,15 +15,16 @@ namespace Ryujinx.Graphics.OpenGL.Image int srcLayer, int dstLayer, int srcLevel, - int dstLevel) + int dstLevel, + float scaleFactor = 1f) { - int srcWidth = srcInfo.Width; - int srcHeight = srcInfo.Height; + int srcWidth = (int)Math.Ceiling(srcInfo.Width * scaleFactor); + int srcHeight = (int)Math.Ceiling(srcInfo.Height * scaleFactor); int srcDepth = srcInfo.GetDepthOrLayers(); int srcLevels = srcInfo.Levels; - int dstWidth = dstInfo.Width; - int dstHeight = dstInfo.Height; + int dstWidth = (int)Math.Ceiling(dstInfo.Width * scaleFactor); + int dstHeight = (int)Math.Ceiling(dstInfo.Height * scaleFactor); int dstDepth = dstInfo.GetDepthOrLayers(); int dstLevels = dstInfo.Levels; -- cgit v1.2.3