From 43081c16c48d73dfd585d951281fcbd60bebccbc Mon Sep 17 00:00:00 2001 From: gdkchan Date: Sun, 5 Feb 2023 18:52:57 -0300 Subject: [PATCH] Insert bitcast for assignment of fragment integer outputs on GLSL (#4369) * Insert bitcast for assignment of fragment integer outputs on GLSL * Shader cache version bump --- .../Shader/DiskCache/DiskCacheHostStorage.cs | 2 +- Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs b/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs index dcd0eb70..1f6dab89 100644 --- a/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs +++ b/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs @@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache private const ushort FileFormatVersionMajor = 1; private const ushort FileFormatVersionMinor = 2; private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor; - private const uint CodeGenVersion = 4336; + private const uint CodeGenVersion = 4369; private const string SharedTocFileName = "shared.toc"; private const string SharedDataFileName = "shared.data"; diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs index 080f1708..ce1ab50e 100644 --- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs +++ b/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs @@ -485,6 +485,16 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl AttributeType type = context.Config.GpuAccessor.QueryAttributeType(location); + return type.ToAggregateType(); + } + else if (context.Config.Stage == ShaderStage.Fragment && isAsgDest && + operand.Value >= AttributeConsts.FragmentOutputColorBase && + operand.Value < AttributeConsts.FragmentOutputColorEnd) + { + int location = (operand.Value - AttributeConsts.FragmentOutputColorBase) / 16; + + AttributeType type = context.Config.GpuAccessor.QueryFragmentOutputType(location); + return type.ToAggregateType(); } }