mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-09-10 05:33:16 +02:00
Correct non-constant offset rewrite for texelFetch
This commit is contained in:
parent
f2c85c5d58
commit
171c3d54c6
@ -140,8 +140,7 @@ namespace Ryujinx.Graphics.Shader.StructuredIr
|
|||||||
{
|
{
|
||||||
// TODO: Return correct type depending on source index,
|
// TODO: Return correct type depending on source index,
|
||||||
// that can improve the decompiler output.
|
// that can improve the decompiler output.
|
||||||
if (
|
if (inst == Instruction.ImageLoad ||
|
||||||
inst == Instruction.ImageLoad ||
|
|
||||||
inst == Instruction.ImageStore ||
|
inst == Instruction.ImageStore ||
|
||||||
inst == Instruction.Lod ||
|
inst == Instruction.Lod ||
|
||||||
inst == Instruction.TextureSample)
|
inst == Instruction.TextureSample)
|
||||||
|
@ -126,6 +126,15 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
|
|
||||||
private static LinkedListNode<INode> RewriteTextureSample(LinkedListNode<INode> node)
|
private static LinkedListNode<INode> RewriteTextureSample(LinkedListNode<INode> node)
|
||||||
{
|
{
|
||||||
|
// Technically, non-constant texture offsets are not allowed (according to the spec),
|
||||||
|
// however some GPUs does support that.
|
||||||
|
// For GPUs where it is not supported, we can replace the instruction with the following:
|
||||||
|
// For texture*Offset, we replace it by texture*, and add the offset to the P coords.
|
||||||
|
// The offset can be calculated as offset / textureSize(lod), where lod = textureQueryLod(coords).
|
||||||
|
// For texelFetchOffset, we replace it by texelFetch and add the offset to the P coords directly.
|
||||||
|
// For textureGatherOffset, we take advantage of the fact that the operation is already broken down
|
||||||
|
// to read the 4 pixels separately, and just replace it with 4 textureGather with a different offset
|
||||||
|
// for each pixel.
|
||||||
TextureOperation texOp = (TextureOperation)node.Value;
|
TextureOperation texOp = (TextureOperation)node.Value;
|
||||||
|
|
||||||
bool hasOffset = (texOp.Flags & TextureFlags.Offset) != 0;
|
bool hasOffset = (texOp.Flags & TextureFlags.Offset) != 0;
|
||||||
@ -139,6 +148,7 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0;
|
bool isBindless = (texOp.Flags & TextureFlags.Bindless) != 0;
|
||||||
bool isGather = (texOp.Flags & TextureFlags.Gather) != 0;
|
bool isGather = (texOp.Flags & TextureFlags.Gather) != 0;
|
||||||
bool hasDerivatives = (texOp.Flags & TextureFlags.Derivatives) != 0;
|
bool hasDerivatives = (texOp.Flags & TextureFlags.Derivatives) != 0;
|
||||||
|
bool intCoords = (texOp.Flags & TextureFlags.IntCoords) != 0;
|
||||||
bool hasLodBias = (texOp.Flags & TextureFlags.LodBias) != 0;
|
bool hasLodBias = (texOp.Flags & TextureFlags.LodBias) != 0;
|
||||||
bool hasLodLevel = (texOp.Flags & TextureFlags.LodLevel) != 0;
|
bool hasLodLevel = (texOp.Flags & TextureFlags.LodLevel) != 0;
|
||||||
|
|
||||||
@ -228,6 +238,34 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
sources[dstIndex++] = texOp.GetSource(srcIndex++);
|
sources[dstIndex++] = texOp.GetSource(srcIndex++);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int coordsIndex = isBindless || isIndexed ? 1 : 0;
|
||||||
|
|
||||||
|
if (intCoords)
|
||||||
|
{
|
||||||
|
for (int index = 0; index < coordsCount; index++)
|
||||||
|
{
|
||||||
|
Operand source = sources[coordsIndex + index];
|
||||||
|
|
||||||
|
Operand coordPlusOffset = Local();
|
||||||
|
|
||||||
|
node.List.AddBefore(node, new Operation(Instruction.Add, coordPlusOffset, source, offsets[index]));
|
||||||
|
|
||||||
|
sources[coordsIndex + index] = coordPlusOffset;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Operand lod = Local();
|
||||||
|
|
||||||
|
node.List.AddBefore(node, new TextureOperation(
|
||||||
|
Instruction.Lod,
|
||||||
|
texOp.Type,
|
||||||
|
texOp.Flags,
|
||||||
|
texOp.Handle,
|
||||||
|
1,
|
||||||
|
lod,
|
||||||
|
lodSources));
|
||||||
|
|
||||||
Operand Int(Operand value)
|
Operand Int(Operand value)
|
||||||
{
|
{
|
||||||
Operand res = Local();
|
Operand res = Local();
|
||||||
@ -246,19 +284,6 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
Operand lod = Local();
|
|
||||||
|
|
||||||
node.List.AddBefore(node, new TextureOperation(
|
|
||||||
Instruction.Lod,
|
|
||||||
texOp.Type,
|
|
||||||
texOp.Flags,
|
|
||||||
texOp.Handle,
|
|
||||||
1,
|
|
||||||
lod,
|
|
||||||
lodSources));
|
|
||||||
|
|
||||||
int coordsIndex = isBindless || isIndexed ? 1 : 0;
|
|
||||||
|
|
||||||
for (int index = 0; index < coordsCount; index++)
|
for (int index = 0; index < coordsCount; index++)
|
||||||
{
|
{
|
||||||
Operand coordSize = Local();
|
Operand coordSize = Local();
|
||||||
@ -297,6 +322,7 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||||||
|
|
||||||
sources[coordsIndex + index] = coordPlusOffset;
|
sources[coordsIndex + index] = coordPlusOffset;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
int componentIndex;
|
int componentIndex;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user