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

Only enable clip distance if written to on shader (#2217)

Browse source 
* Only enable clip distance if written to on shader

* Signal InstanceId use through FeatureFlags

* Shader cache version bump
This commit is contained in:
gdkchan 2021-04-20 07:33:54 -03:00 • committed by GitHub
parent 89791ba68d
commit 4770cfa920
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 79 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Ryujinx.Graphics.Shader/Translation/EmitterContext.cs
View file

@ -55,7 +55,11 @@ namespace Ryujinx.Graphics.Shader.Translation
public void FlagAttributeRead(int attribute)
{
if (Config.Stage == ShaderStage.Fragment)
if (Config.Stage == ShaderStage.Vertex && attribute == AttributeConsts.InstanceId)
{
Config.SetUsedFeature(FeatureFlags.InstanceId);
}
else if (Config.Stage == ShaderStage.Fragment)
{
switch (attribute)
{
@ -67,6 +71,26 @@ namespace Ryujinx.Graphics.Shader.Translation
}
}
public void FlagAttributeWritten(int attribute)
{
if (Config.Stage == ShaderStage.Vertex)
{
switch (attribute)
{
case AttributeConsts.ClipDistance0:
case AttributeConsts.ClipDistance1:
case AttributeConsts.ClipDistance2:
case AttributeConsts.ClipDistance3:
case AttributeConsts.ClipDistance4:
case AttributeConsts.ClipDistance5:
case AttributeConsts.ClipDistance6:
case AttributeConsts.ClipDistance7:
Config.SetClipDistanceWritten((attribute - AttributeConsts.ClipDistance0) / 4);
break;
}
}
}
public void MarkLabel(Operand label)
{
Add(Instruction.MarkLabel, label);

6
Ryujinx.Graphics.Shader/Translation/FeatureFlags.cs
View file

@ -12,9 +12,11 @@ namespace Ryujinx.Graphics.Shader.Translation
None = 0,
// Affected by resolution scaling.
FragCoordXY = 1 << 1,
IntegerSampling = 1 << 0,
FragCoordXY = 1 << 1,
Bindless = 1 << 2,
Bindless = 1 << 2,
InstanceId = 1 << 3
}
}

7
Ryujinx.Graphics.Shader/Translation/ShaderConfig.cs
View file

@ -28,6 +28,8 @@ namespace Ryujinx.Graphics.Shader.Translation
public int Size { get; private set; }
public byte ClipDistancesWritten { get; private set; }
public FeatureFlags UsedFeatures { get; private set; }
public HashSet<int> TextureHandlesForCache { get; }
@ -115,6 +117,11 @@ namespace Ryujinx.Graphics.Shader.Translation
Size += size;
}
public void SetClipDistanceWritten(int index)
{
ClipDistancesWritten |= (byte)(1 << index);
}
public void SetUsedFeature(FeatureFlags flags)
{
UsedFeatures |= flags;

3
Ryujinx.Graphics.Shader/Translation/Translator.cs
View file

@ -94,7 +94,8 @@ namespace Ryujinx.Graphics.Shader.Translation
program.SBufferDescriptors,
program.TextureDescriptors,
program.ImageDescriptors,
sInfo.UsesInstanceId);
config.UsedFeatures.HasFlag(FeatureFlags.InstanceId),
config.ClipDistancesWritten);
string glslCode = program.Code;