From 142cededd4db2ff4f83a4833580d343a4f0a8cde Mon Sep 17 00:00:00 2001 From: riperiperi Date: Tue, 31 Aug 2021 06:51:57 +0100 Subject: Implement Shader Instructions SUATOM and SURED (#2090) * Initial Implementation * Further improvements (no support for float/64-bit types) * Merge atomic and reduce instructions, add missing format switch * Fix rebase issues. * Not used. * Whoops. Fixed. * Partial implementation of inc/dec, cleanup and TODOs * Remove testing path * Address Feedback --- .../Translation/Optimizations/BindlessElimination.cs | 15 +++++++++++++-- .../Translation/Optimizations/Optimizer.cs | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'Ryujinx.Graphics.Shader/Translation/Optimizations') diff --git a/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs b/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs index e66bde0a..709668f4 100644 --- a/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs +++ b/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs @@ -61,7 +61,9 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations src0.GetCbufOffset() | ((src1.GetCbufOffset() + 1) << 16), src0.GetCbufSlot() | ((src1.GetCbufSlot() + 1) << 16)); } - else if (texOp.Inst == Instruction.ImageLoad || texOp.Inst == Instruction.ImageStore) + else if (texOp.Inst == Instruction.ImageLoad || + texOp.Inst == Instruction.ImageStore || + texOp.Inst == Instruction.ImageAtomic) { Operand src0 = Utils.FindLastOperation(texOp.GetSource(0), block); @@ -69,7 +71,16 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations { int cbufOffset = src0.GetCbufOffset(); int cbufSlot = src0.GetCbufSlot(); - texOp.Format = config.GetTextureFormat(cbufOffset, cbufSlot); + + if (texOp.Inst == Instruction.ImageAtomic) + { + texOp.Format = config.GetTextureFormatAtomic(cbufOffset, cbufSlot); + } + else + { + texOp.Format = config.GetTextureFormat(cbufOffset, cbufSlot); + } + SetHandle(config, texOp, cbufOffset, cbufSlot); } } diff --git a/Ryujinx.Graphics.Shader/Translation/Optimizations/Optimizer.cs b/Ryujinx.Graphics.Shader/Translation/Optimizations/Optimizer.cs index 51fe825f..078f3bb9 100644 --- a/Ryujinx.Graphics.Shader/Translation/Optimizations/Optimizer.cs +++ b/Ryujinx.Graphics.Shader/Translation/Optimizations/Optimizer.cs @@ -278,6 +278,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations case Instruction.AtomicSwap: case Instruction.AtomicXor: case Instruction.Call: + case Instruction.ImageAtomic: return true; } } -- cgit v1.2.3