Capture/Replay: Don't assert when reading combined depth/stencil

We can't actually read them back at the moment, so this needs a proper fix. In the meantime, the apps we are tracking don't need this value at the beginning of the trace. Test: Angry Birds 2 MEC Bug: angleproject:3662 Bug: angleproject:4688 Bug: b/157672184 Change-Id: I67190092bcce7080edc69714f1ca1194c37d54fb Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2231802Reviewed-by: Manh Nguyen <nguyenmh@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>

Capture/Replay: Don't assert when reading combined depth/stencil
15328f69 · Cody Northrop · Commit Bot · 4360c6b9 · 15328f69
Commit 15328f69 authored Jun 04, 2020 by Cody Northrop Committed by Commit Bot Jun 09, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

vk_helpers.cpp src/libANGLE/renderer/vulkan/vk_helpers.cpp +6 -1

No files found.
--- a/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
@@ -4252,11 +4252,16 @@ angle::Result ImageHelper::readPixelsForGetImage(ContextVk *contextVk,
    {
        if (angleFormat.depthBits > 0)
        {
+            if (angleFormat.stencilBits != 0)
+            {
+                // TODO (anglebug.com/4688) Support combined depth stencil for GetTexImage
+                WARN() << "Unable to pull combined depth/stencil for GetTexImage";
+                return angle::Result::Continue;
+            }
            aspectFlags = VK_IMAGE_ASPECT_DEPTH_BIT;
        }
        if (angleFormat.stencilBits > 0)
        {
-            ASSERT(angleFormat.depthBits == 0);
            aspectFlags = VK_IMAGE_ASPECT_STENCIL_BIT;
        }
    }