diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2021-06-20 15:48:12 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-20 20:48:12 +0200 |
| commit | 65fee49e8a6fd6dcc058e3cfd52b2c26f038eced (patch) | |
| tree | b250d31ee520e13dee9d9e1514a0f51c50147021 | |
| parent | afd3153ca44225c1258f7d87cf5c098542229c74 (diff) | |
Fix separate bindless sampler at offset 0 (#2360)
| -rw-r--r-- | Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs b/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs index 1989131e..d96d2b2a 100644 --- a/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs +++ b/Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs @@ -473,7 +473,7 @@ namespace Ryujinx.Graphics.Gpu.Image ? bufferManager.GetComputeUniformBufferAddress(samplerBufferIndex) : bufferManager.GetGraphicsUniformBufferAddress(stageIndex, samplerBufferIndex); - handle |= _context.PhysicalMemory.Read<int>(samplerBufferAddress + (ulong)((uint)wordOffset >> HandleHigh) * 4); + handle |= _context.PhysicalMemory.Read<int>(samplerBufferAddress + (ulong)((wordOffset >> HandleHigh) - 1) * 4); } return handle; diff --git a/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs b/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs index 6156a6f4..e66bde0a 100644 --- a/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs +++ b/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs @@ -58,7 +58,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations SetHandle( config, texOp, - src0.GetCbufOffset() | (src1.GetCbufOffset() << 16), + src0.GetCbufOffset() | ((src1.GetCbufOffset() + 1) << 16), src0.GetCbufSlot() | ((src1.GetCbufSlot() + 1) << 16)); } else if (texOp.Inst == Instruction.ImageLoad || texOp.Inst == Instruction.ImageStore) |