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.Shader/Instructions/InstEmitMemory.cs | 4 ++++ Ryujinx.Graphics.Shader/Instructions/InstEmitTexture.cs | 6 ++++++ 2 files changed, 10 insertions(+) (limited to 'Ryujinx.Graphics.Shader/Instructions') diff --git a/Ryujinx.Graphics.Shader/Instructions/InstEmitMemory.cs b/Ryujinx.Graphics.Shader/Instructions/InstEmitMemory.cs index 2418293d..24ba9a06 100644 --- a/Ryujinx.Graphics.Shader/Instructions/InstEmitMemory.cs +++ b/Ryujinx.Graphics.Shader/Instructions/InstEmitMemory.cs @@ -32,6 +32,8 @@ namespace Ryujinx.Graphics.Shader.Instructions Operand src = Attribute(op.AttributeOffset + index * 4); + context.FlagAttributeRead(src.Value); + context.Copy(Register(rd), context.LoadAttribute(src, primVertex)); } } @@ -96,6 +98,8 @@ namespace Ryujinx.Graphics.Shader.Instructions { OpCodeIpa op = (OpCodeIpa)context.CurrOp; + context.FlagAttributeRead(op.AttributeOffset); + Operand res = Attribute(op.AttributeOffset); if (op.AttributeOffset >= AttributeConsts.UserAttributeBase && diff --git a/Ryujinx.Graphics.Shader/Instructions/InstEmitTexture.cs b/Ryujinx.Graphics.Shader/Instructions/InstEmitTexture.cs index 304906d0..ea153b11 100644 --- a/Ryujinx.Graphics.Shader/Instructions/InstEmitTexture.cs +++ b/Ryujinx.Graphics.Shader/Instructions/InstEmitTexture.cs @@ -283,11 +283,15 @@ namespace Ryujinx.Graphics.Shader.Instructions public static void Tld(EmitterContext context) { + context.UsedFeatures |= FeatureFlags.IntegerSampling; + EmitTextureSample(context, TextureFlags.IntCoords); } public static void TldB(EmitterContext context) { + context.UsedFeatures |= FeatureFlags.IntegerSampling; + EmitTextureSample(context, TextureFlags.IntCoords | TextureFlags.Bindless); } @@ -428,6 +432,8 @@ namespace Ryujinx.Graphics.Shader.Instructions return; } + context.UsedFeatures |= FeatureFlags.IntegerSampling; + flags = ConvertTextureFlags(tldsOp.Target) | TextureFlags.IntCoords; if (tldsOp.Target == TexelLoadTarget.Texture1DLodZero && context.Config.GpuAccessor.QueryIsTextureBuffer(tldsOp.Immediate)) -- cgit v1.2.3