Fix veldrid#481

dtatarnikov · Jul 6, 2023 · f5c5a34 · f5c5a34
1 parent 36a1b08
commit f5c5a34
Showing 1 changed file with 39 additions and 12 deletions.
diff --git a/src/Veldrid/OpenGL/OpenGLCommandExecutor.cs b/src/Veldrid/OpenGL/OpenGLCommandExecutor.cs
@@ -94,28 +94,55 @@ public void ClearColorTarget(uint index, RgbaFloat clearColor)
 
         public void ClearDepthStencil(float depth, byte stencil)
         {
-            glClearDepth_Compat(depth);
-            CheckLastError();
+            if (_graphicsPipeline != null)
+            {
+                if (!_graphicsPipeline.DepthStencilState.DepthWriteEnabled)
+                {
+                    glDepthMask(true);
+                    CheckLastError();
+                }
+
+                if (_graphicsPipeline.DepthStencilState.StencilWriteMask != 0xFF)
+                {
+                    glStencilMask(0xFF);
+                    CheckLastError();
+                }
 
-            glStencilMask(~0u);
+                if (_graphicsPipeline.RasterizerState.ScissorTestEnabled)
+                {
+                    glDisable(EnableCap.ScissorTest);
+                    CheckLastError();
+                }
+            }
+
+            glClearDepth_Compat(depth);
             CheckLastError();
 
             glClearStencil(stencil);
             CheckLastError();
 
-            if (_graphicsPipeline != null && _graphicsPipeline.RasterizerState.ScissorTestEnabled)
-            {
-                glDisable(EnableCap.ScissorTest);
-                CheckLastError();
-            }
-
-            glDepthMask(true);
             glClear(ClearBufferMask.DepthBufferBit | ClearBufferMask.StencilBufferBit);
             CheckLastError();
 
-            if (_graphicsPipeline != null && _graphicsPipeline.RasterizerState.ScissorTestEnabled)
+            if (_graphicsPipeline != null)
             {
-                glEnable(EnableCap.ScissorTest);
+                if (!_graphicsPipeline.DepthStencilState.DepthWriteEnabled)
+                {
+                    glDepthMask(false);
+                    CheckLastError();
+                }
+
+                if (_graphicsPipeline.DepthStencilState.StencilWriteMask != 0xFF)
+                {
+                    glStencilMask(_graphicsPipeline.DepthStencilState.StencilWriteMask);
+                    CheckLastError();
+                }
+
+                if (_graphicsPipeline.RasterizerState.ScissorTestEnabled)
+                {
+                    glEnable(EnableCap.ScissorTest);
+                    CheckLastError();
+                }
             }
         }