diff options
-rw-r--r-- | Ryujinx.Graphics.OpenGL/EnumConversion.cs | 2 | ||||
-rw-r--r-- | Ryujinx.Graphics.Vulkan/EnumConversion.cs | 1 | ||||
-rw-r--r-- | Ryujinx.Graphics.Vulkan/PipelineBase.cs | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Ryujinx.Graphics.OpenGL/EnumConversion.cs b/Ryujinx.Graphics.OpenGL/EnumConversion.cs index 4a06e9649..f262c584c 100644 --- a/Ryujinx.Graphics.OpenGL/EnumConversion.cs +++ b/Ryujinx.Graphics.OpenGL/EnumConversion.cs | |||
@@ -331,7 +331,7 @@ namespace Ryujinx.Graphics.OpenGL | |||
331 | case PrimitiveTopology.QuadStrip: | 331 | case PrimitiveTopology.QuadStrip: |
332 | return PrimitiveType.QuadStrip; | 332 | return PrimitiveType.QuadStrip; |
333 | case PrimitiveTopology.Polygon: | 333 | case PrimitiveTopology.Polygon: |
334 | return PrimitiveType.Polygon; | 334 | return PrimitiveType.TriangleFan; |
335 | case PrimitiveTopology.LinesAdjacency: | 335 | case PrimitiveTopology.LinesAdjacency: |
336 | return PrimitiveType.LinesAdjacency; | 336 | return PrimitiveType.LinesAdjacency; |
337 | case PrimitiveTopology.LineStripAdjacency: | 337 | case PrimitiveTopology.LineStripAdjacency: |
diff --git a/Ryujinx.Graphics.Vulkan/EnumConversion.cs b/Ryujinx.Graphics.Vulkan/EnumConversion.cs index 804cd70c4..9d9be65eb 100644 --- a/Ryujinx.Graphics.Vulkan/EnumConversion.cs +++ b/Ryujinx.Graphics.Vulkan/EnumConversion.cs | |||
@@ -180,6 +180,7 @@ namespace Ryujinx.Graphics.Vulkan | |||
180 | GAL.PrimitiveTopology.TrianglesAdjacency => Silk.NET.Vulkan.PrimitiveTopology.TriangleListWithAdjacency, | 180 | GAL.PrimitiveTopology.TrianglesAdjacency => Silk.NET.Vulkan.PrimitiveTopology.TriangleListWithAdjacency, |
181 | GAL.PrimitiveTopology.TriangleStripAdjacency => Silk.NET.Vulkan.PrimitiveTopology.TriangleStripWithAdjacency, | 181 | GAL.PrimitiveTopology.TriangleStripAdjacency => Silk.NET.Vulkan.PrimitiveTopology.TriangleStripWithAdjacency, |
182 | GAL.PrimitiveTopology.Patches => Silk.NET.Vulkan.PrimitiveTopology.PatchList, | 182 | GAL.PrimitiveTopology.Patches => Silk.NET.Vulkan.PrimitiveTopology.PatchList, |
183 | GAL.PrimitiveTopology.Polygon => Silk.NET.Vulkan.PrimitiveTopology.TriangleFan, | ||
183 | GAL.PrimitiveTopology.Quads => throw new NotSupportedException("Quad topology is not available in Vulkan."), | 184 | GAL.PrimitiveTopology.Quads => throw new NotSupportedException("Quad topology is not available in Vulkan."), |
184 | GAL.PrimitiveTopology.QuadStrip => throw new NotSupportedException("QuadStrip topology is not available in Vulkan."), | 185 | GAL.PrimitiveTopology.QuadStrip => throw new NotSupportedException("QuadStrip topology is not available in Vulkan."), |
185 | _ => LogInvalidAndReturn(topology, nameof(GAL.PrimitiveTopology), Silk.NET.Vulkan.PrimitiveTopology.TriangleList) | 186 | _ => LogInvalidAndReturn(topology, nameof(GAL.PrimitiveTopology), Silk.NET.Vulkan.PrimitiveTopology.TriangleList) |
diff --git a/Ryujinx.Graphics.Vulkan/PipelineBase.cs b/Ryujinx.Graphics.Vulkan/PipelineBase.cs index 87155a0d5..594ed5e78 100644 --- a/Ryujinx.Graphics.Vulkan/PipelineBase.cs +++ b/Ryujinx.Graphics.Vulkan/PipelineBase.cs | |||
@@ -328,7 +328,8 @@ namespace Ryujinx.Graphics.Vulkan | |||
328 | IndexBufferPattern pattern = _topology switch | 328 | IndexBufferPattern pattern = _topology switch |
329 | { | 329 | { |
330 | GAL.PrimitiveTopology.Quads => QuadsToTrisPattern, | 330 | GAL.PrimitiveTopology.Quads => QuadsToTrisPattern, |
331 | GAL.PrimitiveTopology.TriangleFan => TriFanToTrisPattern, | 331 | GAL.PrimitiveTopology.TriangleFan or |
332 | GAL.PrimitiveTopology.Polygon => TriFanToTrisPattern, | ||
332 | _ => throw new NotSupportedException($"Unsupported topology: {_topology}") | 333 | _ => throw new NotSupportedException($"Unsupported topology: {_topology}") |
333 | }; | 334 | }; |
334 | 335 | ||
@@ -359,7 +360,8 @@ namespace Ryujinx.Graphics.Vulkan | |||
359 | pattern = _topology switch | 360 | pattern = _topology switch |
360 | { | 361 | { |
361 | GAL.PrimitiveTopology.Quads => QuadsToTrisPattern, | 362 | GAL.PrimitiveTopology.Quads => QuadsToTrisPattern, |
362 | GAL.PrimitiveTopology.TriangleFan => TriFanToTrisPattern, | 363 | GAL.PrimitiveTopology.TriangleFan or |
364 | GAL.PrimitiveTopology.Polygon => TriFanToTrisPattern, | ||
363 | _ => throw new NotSupportedException($"Unsupported topology: {_topology}") | 365 | _ => throw new NotSupportedException($"Unsupported topology: {_topology}") |
364 | }; | 366 | }; |
365 | } | 367 | } |