diff --git a/src/Ryujinx.Graphics.Vulkan/PipelineState.cs b/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
index 9679dd8af6..f6de4c5e7c 100644
--- a/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
@@ -263,6 +263,9 @@ namespace Ryujinx.Graphics.Vulkan
             SamplesCount = 1;
             DepthMode = true;
 
+            PolygonMode = PolygonMode.Fill;
+            DepthBoundsTestEnable = false;
+
             _supportsExtDynamicState = supportsExtDynamicState;
             _supportsExtDynamicState2 = extendedDynamicState2;
 
@@ -414,7 +417,6 @@ namespace Ryujinx.Graphics.Vulkan
                 var rasterizationState = new PipelineRasterizationStateCreateInfo
                 {
                     SType = StructureType.PipelineRasterizationStateCreateInfo,
-                    PolygonMode = PolygonMode,
                     DepthClampEnable = DepthClampEnable,
                 };
 
@@ -453,7 +455,7 @@ namespace Ryujinx.Graphics.Vulkan
                 var depthStencilState = new PipelineDepthStencilStateCreateInfo
                 {
                     SType = StructureType.PipelineDepthStencilStateCreateInfo,
-                    DepthBoundsTestEnable = false,
+                    DepthBoundsTestEnable = DepthBoundsTestEnable,
                 };
 
                 if (!_supportsExtDynamicState)