Vulkan: Fix assertion in xfb of indirect calls

An assertion was fired which was only valid when emulating transform feedback. The relevant block is conditioned to the respective feature. Bug: angleproject:3571 Change-Id: I287ef6d94c920ccda742e4032bfc389409a38e1f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2599951Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Vulkan: Fix assertion in xfb of indirect calls
74788951 · Shahbaz Youssefi · Commit Bot · 9d45f527 · 74788951 · 74788951
Commit 74788951 authored Dec 22, 2020 by Shahbaz Youssefi Committed by Commit Bot Dec 22, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

ContextVk.cpp src/libANGLE/renderer/vulkan/ContextVk.cpp +5 -2

deqp_khr_gles31_test_expectations.txt src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt +1 -2

No files found.
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
@@ -798,8 +798,11 @@ angle::Result ContextVk::setupDraw(const gl::Context *context,
        mGraphicsDirtyBits.set(DIRTY_BIT_DESCRIPTOR_SETS);
    }
-    // Update transform feedback offsets on every draw call.
+    // Update transform feedback offsets on every draw call when emulating transform feedback.  This
-    if (mState.isTransformFeedbackActiveUnpaused())
+    // relies on the fact that no geometry/tessellation, indirect or indexed calls are supported in
+    // ES3.1 (and emulation is not done for ES3.2).
+    if (getFeatures().emulateTransformFeedback.enabled &&
+        mState.isTransformFeedbackActiveUnpaused())
    {
        ASSERT(firstVertexOrInvalid != -1);
        mXfbBaseVertex             = firstVertexOrInvalid;

--- a/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
@@ -63,8 +63,7 @@
 3588 VULKAN : KHR-GLES31.core.sample_variables.mask.rgba8*i.* = FAIL
 // Geometry shader support
-5406 VULKAN : KHR-GLES31.core.draw_indirect.basic-mode-*adjacency = SKIP
+5483 VULKAN : KHR-GLES31.core.draw_indirect.basic-mode-*adjacency = SKIP
-3571 VULKAN : KHR-GLES31.core.draw_indirect.negative-xfb = SKIP
 ////
 //// Desktop Vulkan expectations