diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2023-09-10 22:22:18 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-11 01:22:18 +0000 |
| commit | e2cfe6fe44b62d7aba1425ae2e621f50045f406c (patch) | |
| tree | 991b3d4c833cce8e1ad82834a85f34744f95372f | |
| parent | 210f4754849bf147a584695c0cced9d14c905f8e (diff) | |
Fix shader GlobalToStorage pass when base address comes from local or shared memory (#5668)1.1.1011
* Fix shader GlobalToStorage pass when base address comes from local or shared memory
* Shader cache version bump
| -rw-r--r-- | src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs | 2 | ||||
| -rw-r--r-- | src/Ryujinx.Graphics.Shader/Translation/Optimizations/GlobalToStorage.cs | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs b/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs index 99ef89ed..4b99bb09 100644 --- a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs +++ b/src/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 = 5551; + private const uint CodeGenVersion = 5668; private const string SharedTocFileName = "shared.toc"; private const string SharedDataFileName = "shared.data"; diff --git a/src/Ryujinx.Graphics.Shader/Translation/Optimizations/GlobalToStorage.cs b/src/Ryujinx.Graphics.Shader/Translation/Optimizations/GlobalToStorage.cs index 0f043f77..e426d54d 100644 --- a/src/Ryujinx.Graphics.Shader/Translation/Optimizations/GlobalToStorage.cs +++ b/src/Ryujinx.Graphics.Shader/Translation/Optimizations/GlobalToStorage.cs @@ -1126,7 +1126,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations // so we want to get the byte offset back, since each one of those word // offsets are a new "local variable" which will not match. - if (operation.GetSource(0).AsgOp is Operation shiftRightOp && + if (operation.GetSource(1).AsgOp is Operation shiftRightOp && shiftRightOp.Inst == Instruction.ShiftRightU32 && shiftRightOp.GetSource(1).Type == OperandType.Constant && shiftRightOp.GetSource(1).Value == 2) @@ -1158,9 +1158,11 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations private static bool TryGetLocalMemoryOffset(Operation operation, out int constOffset) { - if (operation.GetSource(0).Type == OperandType.Constant) + Operand offset = operation.GetSource(1); + + if (offset.Type == OperandType.Constant) { - constOffset = operation.GetSource(0).Value; + constOffset = offset.Value; return true; } |