vleeuwenmenno/Ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement Load/Store Local/Shared and Atomic shared using new instructions (#5241)

Browse Source 
* Implement Load/Store Local/Shared and Atomic shared using new instructions

* Remove now unused code

* Fix base offset register overwrite

* Fix missing storage buffer set index when generating GLSL for Vulkan

* Shader cache version bump

* Remove more unused code

* Some PR feedback
This commit is contained in:
gdkchan
2023-06-15 17:31:53 -03:00
committed by GitHub
parent 32d21ddf17
commit f92921a6d1
30 changed files with 475 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Ryujinx.Graphics.Shader/Translation/Optimizations/GlobalToStorage.cs
View File

@ -244,7 +244,9 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
node = nextNode;
}
}
else if (operation.Inst == Instruction.StoreShared || operation.Inst == Instruction.StoreLocal)
else if (operation.Inst == Instruction.Store &&
(operation.StorageKind == StorageKind.SharedMemory ||
operation.StorageKind == StorageKind.LocalMemory))
{
// The NVIDIA compiler can sometimes use shared or local memory as temporary
// storage to place the base address and size on, so we need
@ -874,7 +876,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
if (bitSize < 32)
{
Operand bitOffset = GetBitOffset(context, offset);
Operand bitOffset = HelperFunctionManager.GetBitOffset(context, offset);
GenerateAtomicCasLoop(context, wordOffset, binding, (memValue) =>
{
@ -892,7 +894,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
if (IsSmallInt(storageKind))
{
Operand bitOffset = GetBitOffset(context, offset);
Operand bitOffset = HelperFunctionManager.GetBitOffset(context, offset);
switch (storageKind)
{
@ -921,11 +923,6 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
return true;
}
private static Operand GetBitOffset(EmitterContext context, Operand offset)
{
return context.ShiftLeft(context.BitwiseAnd(offset, Const(3)), Const(3));
}
private static Operand GenerateAtomicCasLoop(EmitterContext context, Operand wordOffset, int binding, Func<Operand, Operand> opCallback)
{
Operand lblLoopHead = Label();
@ -1070,15 +1067,18 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
{
baseOffset = null;
if (operation.Inst == Instruction.LoadShared || operation.Inst == Instruction.StoreShared)
if (operation.Inst == Instruction.Load || operation.Inst == Instruction.Store)
{
type = LsMemoryType.Shared;
return TryGetSharedMemoryOffsets(operation, out baseOffset, out constOffset);
}
else if (operation.Inst == Instruction.LoadLocal || operation.Inst == Instruction.StoreLocal)
{
type = LsMemoryType.Local;
return TryGetLocalMemoryOffset(operation, out constOffset);
if (operation.StorageKind == StorageKind.SharedMemory)
{
type = LsMemoryType.Shared;
return TryGetSharedMemoryOffsets(operation, out baseOffset, out constOffset);
}
else if (operation.StorageKind == StorageKind.LocalMemory)
{
type = LsMemoryType.Local;
return TryGetLocalMemoryOffset(operation, out constOffset);
}
}
type = default;