Implement scaled vertex format emulation (#5564)
* Implement scaled vertex format emulation * Auto-format (whitespace) * Delete ToVec4Type
This commit is contained in:
parent
492a046335
commit
effd546331
12 changed files with 164 additions and 8 deletions
|
@ -9,6 +9,8 @@ namespace Ryujinx.Graphics.Shader
|
|||
Float,
|
||||
Sint,
|
||||
Uint,
|
||||
Sscaled,
|
||||
Uscaled,
|
||||
}
|
||||
|
||||
static class AttributeTypeExtensions
|
||||
|
@ -23,5 +25,18 @@ namespace Ryujinx.Graphics.Shader
|
|||
_ => throw new ArgumentException($"Invalid attribute type \"{type}\"."),
|
||||
};
|
||||
}
|
||||
|
||||
public static AggregateType ToAggregateType(this AttributeType type, bool supportsScaledFormats)
|
||||
{
|
||||
return type switch
|
||||
{
|
||||
AttributeType.Float => AggregateType.FP32,
|
||||
AttributeType.Sint => AggregateType.S32,
|
||||
AttributeType.Uint => AggregateType.U32,
|
||||
AttributeType.Sscaled => supportsScaledFormats ? AggregateType.FP32 : AggregateType.S32,
|
||||
AttributeType.Uscaled => supportsScaledFormats ? AggregateType.FP32 : AggregateType.U32,
|
||||
_ => throw new ArgumentException($"Invalid attribute type \"{type}\"."),
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -266,6 +266,15 @@ namespace Ryujinx.Graphics.Shader
|
|||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Queries host support scaled vertex formats, where a integer value is converted to floating-point.
|
||||
/// </summary>
|
||||
/// <returns>True if the host support scaled vertex formats, false otherwise</returns>
|
||||
bool QueryHostSupportsScaledVertexFormats()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Queries host GPU shader ballot support.
|
||||
/// </summary>
|
||||
|
|
|
@ -61,7 +61,31 @@ namespace Ryujinx.Graphics.Shader.Instructions
|
|||
}
|
||||
else
|
||||
{
|
||||
context.Copy(Register(rd), AttributeMap.GenerateAttributeLoad(context, primVertex, offset, isOutput, op.P));
|
||||
value = AttributeMap.GenerateAttributeLoad(context, primVertex, offset, isOutput, op.P);
|
||||
|
||||
if (!context.TranslatorContext.Definitions.SupportsScaledVertexFormats &&
|
||||
context.TranslatorContext.Stage == ShaderStage.Vertex &&
|
||||
!op.O &&
|
||||
offset >= 0x80 &&
|
||||
offset < 0x280)
|
||||
{
|
||||
// The host does not support scaled vertex formats,
|
||||
// the emulator should use a integer format, and
|
||||
// we compensate here inserting the conversion to float.
|
||||
|
||||
AttributeType type = context.TranslatorContext.Definitions.GetAttributeType((offset - 0x80) >> 4);
|
||||
|
||||
if (type == AttributeType.Sscaled)
|
||||
{
|
||||
value = context.IConvertS32ToFP32(value);
|
||||
}
|
||||
else if (type == AttributeType.Uscaled)
|
||||
{
|
||||
value = context.IConvertU32ToFP32(value);
|
||||
}
|
||||
}
|
||||
|
||||
context.Copy(Register(rd), value);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -53,6 +53,8 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||
public bool OmapSampleMask { get; }
|
||||
public bool OmapDepth { get; }
|
||||
|
||||
public bool SupportsScaledVertexFormats { get; }
|
||||
|
||||
public bool TransformFeedbackEnabled { get; }
|
||||
|
||||
private readonly TransformFeedbackOutput[] _transformFeedbackOutputs;
|
||||
|
@ -139,6 +141,7 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||
int omapTargets,
|
||||
bool omapSampleMask,
|
||||
bool omapDepth,
|
||||
bool supportsScaledVertexFormats,
|
||||
bool transformFeedbackEnabled,
|
||||
ulong transformFeedbackVecMap,
|
||||
TransformFeedbackOutput[] transformFeedbackOutputs)
|
||||
|
@ -154,6 +157,7 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||
OmapSampleMask = omapSampleMask;
|
||||
OmapDepth = omapDepth;
|
||||
LastInVertexPipeline = stage < ShaderStage.Fragment;
|
||||
SupportsScaledVertexFormats = supportsScaledVertexFormats;
|
||||
TransformFeedbackEnabled = transformFeedbackEnabled;
|
||||
_transformFeedbackOutputs = transformFeedbackOutputs;
|
||||
_transformFeedbackDefinitions = new();
|
||||
|
@ -302,7 +306,7 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||
|
||||
if (Stage == ShaderStage.Vertex && !isOutput)
|
||||
{
|
||||
type |= _graphicsState.AttributeTypes[location].ToAggregateType();
|
||||
type |= _graphicsState.AttributeTypes[location].ToAggregateType(SupportsScaledVertexFormats);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -311,5 +315,10 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||
|
||||
return type;
|
||||
}
|
||||
|
||||
public AttributeType GetAttributeType(int location)
|
||||
{
|
||||
return _graphicsState.AttributeTypes[location];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -116,6 +116,7 @@ namespace Ryujinx.Graphics.Shader.Translation
|
|||
header.OmapTargets,
|
||||
header.OmapSampleMask,
|
||||
header.OmapDepth,
|
||||
gpuAccessor.QueryHostSupportsScaledVertexFormats(),
|
||||
transformFeedbackEnabled,
|
||||
transformFeedbackVecMap,
|
||||
transformFeedbackOutputs);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue