mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove constant buffer match to reduce the chances of full bindless triggering

Browse source
This commit is contained in:
Gabriel A 2024-05-26 13:33:07 -03:00
commit 5c62a839f3
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Ryujinx.Graphics.Shader/Translation/Optimizations/BindlessElimination.cs
View file

@ -68,9 +68,9 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
return false; return false;
} }
Operand nvHandle = texOp.GetSource(0); Operand bindlessHandle = texOp.GetSource(0);
if (nvHandle.AsgOp is PhiNode phi) if (bindlessHandle.AsgOp is PhiNode phi)
{ {
for (int srcIndex = 0; srcIndex < phi.SourcesCount; srcIndex++) for (int srcIndex = 0; srcIndex < phi.SourcesCount; srcIndex++)
{ {
@ -82,7 +82,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
} }
} }
} }
else if (!IsBindlessAccessAllowed(nvHandle)) else if (!IsBindlessAccessAllowed(bindlessHandle))
{ {
return false; return false;
} }
@ -91,8 +91,8 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
Operand samplerHandle = OperandHelper.Local(); Operand samplerHandle = OperandHelper.Local();
Operand textureIndex = OperandHelper.Local(); Operand textureIndex = OperandHelper.Local();
block.Operations.AddBefore(node, new Operation(Instruction.BitwiseAnd, textureHandle, nvHandle, OperandHelper.Const(0xfffff))); block.Operations.AddBefore(node, new Operation(Instruction.BitwiseAnd, textureHandle, bindlessHandle, OperandHelper.Const(0xfffff)));
block.Operations.AddBefore(node, new Operation(Instruction.ShiftRightU32, samplerHandle, nvHandle, OperandHelper.Const(20))); block.Operations.AddBefore(node, new Operation(Instruction.ShiftRightU32, samplerHandle, bindlessHandle, OperandHelper.Const(20)));
int texturePoolLength = Math.Max(BindlessToArray.MinimumArrayLength, gpuAccessor.QueryTextureArrayLengthFromPool()); int texturePoolLength = Math.Max(BindlessToArray.MinimumArrayLength, gpuAccessor.QueryTextureArrayLengthFromPool());
@ -143,13 +143,6 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
private static bool IsBindlessAccessAllowed(Operand nvHandle) private static bool IsBindlessAccessAllowed(Operand nvHandle)
{ {
if (nvHandle.Type == OperandType.ConstantBuffer)
{
// Bindless access with handles from constant buffer is allowed.
return true;
}
if (nvHandle.AsgOp is not Operation handleOp || if (nvHandle.AsgOp is not Operation handleOp ||
handleOp.Inst != Instruction.Load || handleOp.Inst != Instruction.Load ||
(handleOp.StorageKind != StorageKind.Input && handleOp.StorageKind != StorageKind.StorageBuffer)) (handleOp.StorageKind != StorageKind.Input && handleOp.StorageKind != StorageKind.StorageBuffer))