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

Move TopologyClass conversoin to EnumConversion.cs

Browse source
This commit is contained in:
sunshineinabox 2024-07-23 21:54:01 -07:00
parent 34ac6f33ad
commit 2cba50a9ed
2 changed files with 28 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Ryujinx.Graphics.Vulkan/EnumConversion.cs
View file

@ -310,6 +310,28 @@ namespace Ryujinx.Graphics.Vulkan
}; };
} }
public static PrimitiveTopology ConvertToClass(this GAL.PrimitiveTopology topology)
{
return topology switch
{
GAL.PrimitiveTopology.Points => PrimitiveTopology.PointList,
GAL.PrimitiveTopology.Lines or
GAL.PrimitiveTopology.LineStrip or
GAL.PrimitiveTopology.LinesAdjacency or
GAL.PrimitiveTopology.LineStripAdjacency => PrimitiveTopology.LineList,
GAL.PrimitiveTopology.Triangles or
GAL.PrimitiveTopology.TriangleStrip or
GAL.PrimitiveTopology.TriangleFan or
GAL.PrimitiveTopology.TrianglesAdjacency or
GAL.PrimitiveTopology.TriangleStripAdjacency or
GAL.PrimitiveTopology.Polygon => PrimitiveTopology.TriangleList,
GAL.PrimitiveTopology.Patches => PrimitiveTopology.PatchList,
GAL.PrimitiveTopology.Quads => throw new NotSupportedException("Quad topology is not available in Vulkan."),
GAL.PrimitiveTopology.QuadStrip => throw new NotSupportedException("QuadStrip topology is not available in Vulkan."),
_ => LogInvalidAndReturn(topology, nameof(GAL.PrimitiveTopology), PrimitiveTopology.TriangleList),
};
}
public static StencilOp Convert(this GAL.StencilOp op) public static StencilOp Convert(this GAL.StencilOp op)
{ {
return op switch return op switch

41
src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
View file

@ -640,6 +640,7 @@ namespace Ryujinx.Graphics.Vulkan
var oldDepthTestEnable = _supportExtDynamic ? DynamicState.DepthTestEnable : _newState.DepthTestEnable; var oldDepthTestEnable = _supportExtDynamic ? DynamicState.DepthTestEnable : _newState.DepthTestEnable;
var oldDepthWriteEnable = _supportExtDynamic ? DynamicState.DepthWriteEnable : _newState.DepthWriteEnable; var oldDepthWriteEnable = _supportExtDynamic ? DynamicState.DepthWriteEnable : _newState.DepthWriteEnable;
var oldTopology = _newState.Topology; var oldTopology = _newState.Topology;
var oldTopologyClass = _newState.TopologyClass;
var oldViewports = DynamicState.Viewports; var oldViewports = DynamicState.Viewports;
var oldViewportsCount = _supportExtDynamic ? DynamicState.ViewportsCount : _newState.ViewportsCount; var oldViewportsCount = _supportExtDynamic ? DynamicState.ViewportsCount : _newState.ViewportsCount;
@ -669,9 +670,7 @@ namespace Ryujinx.Graphics.Vulkan
if (_supportExtDynamic) if (_supportExtDynamic)
{ {
var oldTopologyClass = GetTopologyClass(oldTopology); if (oldTopologyClass != Silk.NET.Vulkan.PrimitiveTopology.TriangleList)
if (oldTopologyClass != TopologyClass.Triangle)
{ {
_newState.TopologyClass = oldTopology; _newState.TopologyClass = oldTopology;
} }
@ -1070,12 +1069,12 @@ namespace Ryujinx.Graphics.Vulkan
if (_supportExtDynamic) if (_supportExtDynamic)
{ {
var newTopologyClass = GetTopologyClass(vkTopology); var oldTopologyClass = _newState.TopologyClass;
var currentTopologyClass = GetTopologyClass(_newState.TopologyClass); var newTopologyClass = Gd.TopologyRemap(topology).ConvertToClass();
if ((currentTopologyClass != newTopologyClass)) if ((oldTopologyClass != newTopologyClass))
{ {
_newState.TopologyClass = vkTopology; _newState.TopologyClass = newTopologyClass;
} }
DynamicState.SetPrimitiveTopology(vkTopology); DynamicState.SetPrimitiveTopology(vkTopology);
@ -1086,34 +1085,6 @@ namespace Ryujinx.Graphics.Vulkan
SignalStateChange(); SignalStateChange();
} }
private TopologyClass GetTopologyClass(Silk.NET.Vulkan.PrimitiveTopology topology)
{
return _topologyClassMapping.TryGetValue(topology, out var topologyClass) ? topologyClass : throw new ArgumentOutOfRangeException(nameof(topology), topology, null);
}
private static readonly Dictionary<Silk.NET.Vulkan.PrimitiveTopology, TopologyClass> _topologyClassMapping = new()
{
{ Silk.NET.Vulkan.PrimitiveTopology.PointList, TopologyClass.Point },
{ Silk.NET.Vulkan.PrimitiveTopology.LineList, TopologyClass.Line },
{ Silk.NET.Vulkan.PrimitiveTopology.LineStrip, TopologyClass.Line },
{ Silk.NET.Vulkan.PrimitiveTopology.LineListWithAdjacency, TopologyClass.Line },
{ Silk.NET.Vulkan.PrimitiveTopology.LineStripWithAdjacency, TopologyClass.Line },
{ Silk.NET.Vulkan.PrimitiveTopology.TriangleList, TopologyClass.Triangle },
{ Silk.NET.Vulkan.PrimitiveTopology.TriangleStrip, TopologyClass.Triangle },
{ Silk.NET.Vulkan.PrimitiveTopology.TriangleFan, TopologyClass.Triangle },
{ Silk.NET.Vulkan.PrimitiveTopology.TriangleListWithAdjacency, TopologyClass.Triangle },
{ Silk.NET.Vulkan.PrimitiveTopology.TriangleStripWithAdjacency, TopologyClass.Triangle },
{ Silk.NET.Vulkan.PrimitiveTopology.PatchList, TopologyClass.Patch }
};
private enum TopologyClass
{
Point,
Line,
Triangle,
Patch
}
public void SetProgram(IProgram program) public void SetProgram(IProgram program)
{ {
var internalProgram = (ShaderCollection)program; var internalProgram = (ShaderCollection)program;