manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-02-21 16:43:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Return of the Vector Indexing Bug

Browse source 
One day, everyone will get this right.
This commit is contained in:
riperiperi 2022-05-21 00:24:25 +01:00
parent 9f0feb8879
commit d4ccb6b895
4 changed files with 45 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs
View file

@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
private const ushort FileFormatVersionMajor = 1; private const ushort FileFormatVersionMajor = 1;
private const ushort FileFormatVersionMinor = 2; private const ushort FileFormatVersionMinor = 2;
private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor; private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
private const uint CodeGenVersion = 5; private const uint CodeGenVersion = 6;
private const string SharedTocFileName = "shared.toc"; private const string SharedTocFileName = "shared.toc";
private const string SharedDataFileName = "shared.data"; private const string SharedDataFileName = "shared.data";

50
Ryujinx.Graphics.Shader/CodeGen/Spirv/Instructions.cs
View file

@ -893,24 +893,56 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
var i2 = context.ShiftRightArithmetic(context.TypeS32(), src2, context.Constant(context.TypeS32(), 2)); var i2 = context.ShiftRightArithmetic(context.TypeS32(), src2, context.Constant(context.TypeS32(), 2));
var i3 = context.BitwiseAnd(context.TypeS32(), src2, context.Constant(context.TypeS32(), 3)); var i3 = context.BitwiseAnd(context.TypeS32(), src2, context.Constant(context.TypeS32(), 3));
SpvInstruction elemPointer; SpvInstruction value = null;
if (context.UniformBuffersArray != null) if (context.Config.GpuAccessor.QueryHostHasVectorIndexingBug())
{ {
var ubVariable = context.UniformBuffersArray; // Test for each component individually.
var i0 = context.Get(AggregateType.S32, src1); for (int i = 0; i < 4; i++)
{
var component = context.Constant(context.TypeS32(), i);
elemPointer = context.AccessChain(context.TypePointer(StorageClass.Uniform, context.TypeFP32()), ubVariable, i0, i1, i2, i3); SpvInstruction elemPointer;
if (context.UniformBuffersArray != null)
{
var ubVariable = context.UniformBuffersArray;
var i0 = context.Get(AggregateType.S32, src1);
elemPointer = context.AccessChain(context.TypePointer(StorageClass.Uniform, context.TypeFP32()), ubVariable, i0, i1, i2, component);
}
else
{
var ubVariable = context.UniformBuffers[((AstOperand)src1).Value];
elemPointer = context.AccessChain(context.TypePointer(StorageClass.Uniform, context.TypeFP32()), ubVariable, i1, i2, component);
}
SpvInstruction newValue = context.Load(context.TypeFP32(), elemPointer);
value = value != null ? context.Select(context.TypeFP32(), context.IEqual(context.TypeBool(), i3, component), newValue, value) : newValue;
}
} }
else else
{ {
var ubVariable = context.UniformBuffers[((AstOperand)src1).Value]; SpvInstruction elemPointer;
elemPointer = context.AccessChain(context.TypePointer(StorageClass.Uniform, context.TypeFP32()), ubVariable, i1, i2, i3); if (context.UniformBuffersArray != null)
{
var ubVariable = context.UniformBuffersArray;
var i0 = context.Get(AggregateType.S32, src1);
elemPointer = context.AccessChain(context.TypePointer(StorageClass.Uniform, context.TypeFP32()), ubVariable, i0, i1, i2, i3);
}
else
{
var ubVariable = context.UniformBuffers[((AstOperand)src1).Value];
elemPointer = context.AccessChain(context.TypePointer(StorageClass.Uniform, context.TypeFP32()), ubVariable, i1, i2, i3);
}
value = context.Load(context.TypeFP32(), elemPointer);
} }
var value = context.Load(context.TypeFP32(), elemPointer);
return new OperationResult(AggregateType.FP32, value); return new OperationResult(AggregateType.FP32, value);
} }

1
Ryujinx.Graphics.Vulkan/Vendor.cs
View file

@ -5,6 +5,7 @@ namespace Ryujinx.Graphics.Vulkan
Amd, Amd,
Intel, Intel,
Nvidia, Nvidia,
Qualcomm,
Unknown Unknown
} }
} }

3
Ryujinx.Graphics.Vulkan/VulkanGraphicsDevice.cs
View file

@ -310,7 +310,7 @@ namespace Ryujinx.Graphics.Vulkan
api: TargetApi.Vulkan, api: TargetApi.Vulkan,
GpuVendor, GpuVendor,
hasFrontFacingBug: IsIntelWindows, hasFrontFacingBug: IsIntelWindows,
hasVectorIndexingBug: false, hasVectorIndexingBug: Vendor == Vendor.Qualcomm,
supportsAstcCompression: features.TextureCompressionAstcLdr, supportsAstcCompression: features.TextureCompressionAstcLdr,
supports3DTextureCompression: true, supports3DTextureCompression: true,
supportsBgraFormat: true, supportsBgraFormat: true,
@ -386,6 +386,7 @@ namespace Ryujinx.Graphics.Vulkan
0x1002 => Vendor.Amd, 0x1002 => Vendor.Amd,
0x10DE => Vendor.Nvidia, 0x10DE => Vendor.Nvidia,
0x8086 => Vendor.Intel, 0x8086 => Vendor.Intel,
0x5143 => Vendor.Qualcomm,
_ => Vendor.Unknown _ => Vendor.Unknown
}; };