commit 2249d4a727f27644b98c9a96677863757b8dee7f
author Shahbaz Youssefi <syoussefi@chromium.org> Fri Apr 05 16:48:55 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Apr 11 19:56:12 2019 +0000
tree 31a1ab0c700583eade495af3e06772f4f1307faf
parent 127990f944e791e2a86ababde58b5d8b3cc698aa

Vulkan: remove clear depth ability from clearWithDraw

This partially reverts the following change:

60ec8f576 Vulkan: break dependency to the depthClamp feature

The feature is no longer necessary, and simplifies the usage of
utility shaders.

Bug: angleproject:2361
Change-Id: I1e87ac8d2517c5a3b50e3d0cddd55c852e0e3e7d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1555313
Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Tobin Ehlis <tobine@google.com>

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
index 8288b2e..8d3ca85 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -319,19 +319,14 @@
         }
     }
 
-    // Note: if no driver bug workaround is necessary, the clearDepth feature of
-    // clearWithDraw can be removed.
+    // Note: depth clear is always done through render pass loadOp.
     ASSERT(clearDepth == false);
 
     // The most costly clear mode is when we need to mask out specific color channels or stencil
-    // bits. This can only be done with a draw call. The scissor region however can easily be
-    // integrated with this method.
-    //
-    // Since we have to have a draw call for the sake of masked color or stencil, we can make sure
-    // everything else is cleared with the draw call at the same time as well.
-    return clearWithDraw(contextVk, scissoredRenderArea, clearColorBuffers, clearDepth,
-                         clearStencil, colorMaskFlags, stencilMask, clearColorValue,
-                         modifiedDepthStencilValue);
+    // bits. This can only be done with a draw call.
+    return clearWithDraw(contextVk, scissoredRenderArea, clearColorBuffers, clearStencil,
+                         colorMaskFlags, stencilMask, clearColorValue,
+                         static_cast<uint8_t>(modifiedDepthStencilValue.stencil));
 }
 
 angle::Result FramebufferVk::clearBufferfv(const gl::Context *context,
@@ -1044,12 +1039,11 @@
 angle::Result FramebufferVk::clearWithDraw(ContextVk *contextVk,
                                            const gl::Rectangle &clearArea,
                                            gl::DrawBufferMask clearColorBuffers,
-                                           bool clearDepth,
                                            bool clearStencil,
                                            VkColorComponentFlags colorMaskFlags,
                                            uint8_t stencilMask,
                                            const VkClearColorValue &clearColorValue,
-                                           const VkClearDepthStencilValue &clearDepthStencilValue)
+                                           uint8_t clearStencilValue)
 {
     RendererVk *renderer = contextVk->getRenderer();
 
@@ -1058,11 +1052,10 @@
     params.renderAreaHeight                    = mState.getDimensions().height;
     params.clearArea                           = clearArea;
     params.colorClearValue                     = clearColorValue;
-    params.depthStencilClearValue              = clearDepthStencilValue;
+    params.stencilClearValue                   = clearStencilValue;
     params.stencilMask                         = stencilMask;
 
     params.clearColor   = true;
-    params.clearDepth   = clearDepth;
     params.clearStencil = clearStencil;
 
     const auto &colorRenderTargets = mRenderTargetCache.getColors();
@@ -1081,13 +1074,12 @@
 
         ANGLE_TRY(renderer->getUtils().clearFramebuffer(contextVk, this, params));
 
-        // Clear depth/stencil only once!
-        params.clearDepth   = false;
+        // Clear stencil only once!
         params.clearStencil = false;
     }
 
-    // If there was no color clear, clear depth/stencil alone.
-    if (params.clearDepth || params.clearStencil)
+    // If there was no color clear, clear stencil alone.
+    if (params.clearStencil)
     {
         params.clearColor = false;
         ANGLE_TRY(renderer->getUtils().clearFramebuffer(contextVk, this, params));