From fd9b4cc10fb66dd73d638aa85f501b9ad5cb4804 Mon Sep 17 00:00:00 2001 From: sunshineinabox Date: Sat, 18 May 2024 15:22:23 -0700 Subject: [PATCH] More comments and formatting fixes --- .../PipelineDynamicState.cs | 20 +++++++++---------- src/Ryujinx.Graphics.Vulkan/PipelineState.cs | 3 ++- .../VulkanInitialization.cs | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/Ryujinx.Graphics.Vulkan/PipelineDynamicState.cs b/src/Ryujinx.Graphics.Vulkan/PipelineDynamicState.cs index 6a321c4c1..303633df0 100644 --- a/src/Ryujinx.Graphics.Vulkan/PipelineDynamicState.cs +++ b/src/Ryujinx.Graphics.Vulkan/PipelineDynamicState.cs @@ -92,7 +92,7 @@ namespace Ryujinx.Graphics.Vulkan private const float Epsilon = 1e-6f; - private bool FloatCompare(float a, float b) + private readonly bool FloatCompare(float a, float b) { return Math.Abs(a - b) < Epsilon; } @@ -155,12 +155,12 @@ namespace Ryujinx.Graphics.Vulkan } } - public void SetStencilOp(StencilOp backFailOp, StencilOp backPassOp, StencilOp backDepthFailOp, - CompareOp backCompareOp, StencilOp frontFailOp, StencilOp frontPassOp, StencilOp frontDepthFailOp, + public void SetStencilOp(StencilOp backFailOp, StencilOp backPassOp, StencilOp backDepthFailOp, + CompareOp backCompareOp, StencilOp frontFailOp, StencilOp frontPassOp, StencilOp frontDepthFailOp, CompareOp frontCompareOp) { - if (_backfailop != backFailOp || _backpassop != backPassOp || _backdepthfailop != backDepthFailOp || - _backcompareop != backCompareOp || _frontfailop != frontFailOp || _frontpassop != frontPassOp || + if (_backfailop != backFailOp || _backpassop != backPassOp || _backdepthfailop != backDepthFailOp || + _backcompareop != backCompareOp || _frontfailop != frontFailOp || _frontpassop != frontPassOp || _frontdepthfailop != frontDepthFailOp || _frontcompareop != frontCompareOp) { _backfailop = backFailOp; @@ -175,11 +175,11 @@ namespace Ryujinx.Graphics.Vulkan } } - public void SetStencilMask(uint backCompareMask, uint backWriteMask, uint backReference, + public void SetStencilMask(uint backCompareMask, uint backWriteMask, uint backReference, uint frontCompareMask, uint frontWriteMask, uint frontReference) { - if (_backCompareMask != backCompareMask || _backWriteMask != backWriteMask || - _backReference != backReference || _frontCompareMask != frontCompareMask || + if (_backCompareMask != backCompareMask || _backWriteMask != backWriteMask || + _backReference != backReference || _frontCompareMask != frontCompareMask || _frontWriteMask != frontWriteMask || _frontReference != frontReference) { _backCompareMask = backCompareMask; @@ -465,7 +465,7 @@ namespace Ryujinx.Graphics.Vulkan api.CmdSetBlendConstants(commandBuffer, _blendConstants.AsSpan()); } - private void RecordDepthBias(VulkanRenderer gd, CommandBuffer commandBuffer) + private readonly void RecordDepthBias(VulkanRenderer gd, CommandBuffer commandBuffer) { gd.Api.CmdSetDepthBias(commandBuffer, _depthBiasConstantFactor, _depthBiasClamp, _depthBiasSlopeFactor); @@ -568,7 +568,7 @@ namespace Ryujinx.Graphics.Vulkan { return; } - + gd.ExtendedDynamicState2Api.CmdSetLogicOp(commandBuffer, _logicOp); } diff --git a/src/Ryujinx.Graphics.Vulkan/PipelineState.cs b/src/Ryujinx.Graphics.Vulkan/PipelineState.cs index 57b531575..841512854 100644 --- a/src/Ryujinx.Graphics.Vulkan/PipelineState.cs +++ b/src/Ryujinx.Graphics.Vulkan/PipelineState.cs @@ -481,6 +481,7 @@ namespace Ryujinx.Graphics.Vulkan if (isMoltenVk) { + //When widelines feature is not supported it must be 1.0f per spec. rasterizationState.LineWidth = 1.0f; } @@ -684,7 +685,7 @@ namespace Ryujinx.Graphics.Vulkan { if (!isMoltenVk) { - //Requires Metal 3.1 + //Requires Metal 3.1 and new MoltenVK dynamicStates[currentIndex++] = DynamicState.VertexInputBindingStrideExt; } dynamicStates[currentIndex++] = DynamicState.CullModeExt; diff --git a/src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs b/src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs index ce3a34fdb..8f9e926c1 100644 --- a/src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs +++ b/src/Ryujinx.Graphics.Vulkan/VulkanInitialization.cs @@ -502,7 +502,7 @@ namespace Ryujinx.Graphics.Vulkan supportedFeaturesExtExtendedDynamicState3.ExtendedDynamicState3LogicOpEnable = false; supportedFeaturesExtExtendedDynamicState3.ExtendedDynamicState3AlphaToCoverageEnable = false; - + extendedDynamicState3Features = supportedFeaturesExtExtendedDynamicState3; var featuresVk11 = new PhysicalDeviceVulkan11Features