mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-09-10 13:43:17 +02:00
Preserve image types for shader bindless surface instructions (.D variants) (#2779)
* Preserve image types for SULD/SUST .D variants * Make format unknown for surface atomic if bindless and not sized
This commit is contained in:
parent
51fa1b2cb0
commit
04dfb86fde
@ -264,8 +264,8 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
}
|
||||
|
||||
// TODO: FP and 64-bit formats.
|
||||
TextureFormat format = !isBindless && (size == SuatomSize.Sd32 || size == SuatomSize.Sd64)
|
||||
? context.Config.GetTextureFormatAtomic(imm)
|
||||
TextureFormat format = size == SuatomSize.Sd32 || size == SuatomSize.Sd64
|
||||
? (isBindless ? TextureFormat.Unknown : context.Config.GetTextureFormatAtomic(imm))
|
||||
: GetTextureFormat(size);
|
||||
|
||||
if (compareAndSwap)
|
||||
@ -516,8 +516,8 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
||||
}
|
||||
|
||||
// TODO: FP and 64-bit formats.
|
||||
TextureFormat format = !isBindless && (size == SuatomSize.Sd32 || size == SuatomSize.Sd64)
|
||||
? context.Config.GetTextureFormatAtomic(imm)
|
||||
TextureFormat format = size == SuatomSize.Sd32 || size == SuatomSize.Sd64
|
||||
? (isBindless ? TextureFormat.Unknown : context.Config.GetTextureFormatAtomic(imm))
|
||||
: GetTextureFormat(size);
|
||||
|
||||
sourcesList.Add(Rb());
|
||||
|
@ -128,13 +128,16 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
|
||||
int cbufOffset = src0.GetCbufOffset();
|
||||
int cbufSlot = src0.GetCbufSlot();
|
||||
|
||||
if (texOp.Inst == Instruction.ImageAtomic)
|
||||
if (texOp.Format == TextureFormat.Unknown)
|
||||
{
|
||||
texOp.Format = config.GetTextureFormatAtomic(cbufOffset, cbufSlot);
|
||||
}
|
||||
else
|
||||
{
|
||||
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, false);
|
||||
|
Loading…
Reference in New Issue
Block a user