Vulkan: Fix validation issue with swiftshader

Need to check that a VBO is actually bound (or rather no client arrays are bound) and return appropriate error. Test: angle_deqp_khr_gles31 --use-angle=swiftshader --gtest_filter=dEQP.KHR_GLES31/core_draw_indirect_negativenoVBOarrays Bug: angleproject:3564 Change-Id: Ic200993f9afcc3b43706ac0b509b10fa905857f7 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1922303 Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Tobin Ehlis <tobine@google.com>

Vulkan: Fix validation issue with swiftshader
4b53273c · Courtney Goeltzenleuchter · Commit Bot · a825eb70 · 4b53273c · 4b53273c
Commit 4b53273c authored Nov 21, 2019 by Courtney Goeltzenleuchter Committed by Commit Bot Nov 25, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

validationES31.cpp src/libANGLE/validationES31.cpp +6 -0

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

No files found.
--- a/src/libANGLE/validationES31.cpp
+++ b/src/libANGLE/validationES31.cpp
@@ -438,6 +438,12 @@ bool ValidateDrawIndirectBase(Context *context, PrimitiveMode mode, const void *
        return false;
    }

+    if (context->getStateCache().hasAnyActiveClientAttrib())
+    {
+        context->validationError(GL_INVALID_OPERATION, kClientDataInVertexArray);
+        return false;
+    }
+
    Buffer *drawIndirectBuffer = state.getTargetBuffer(BufferBinding::DrawIndirect);
    if (!drawIndirectBuffer)
    {

--- a/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
@@ -92,8 +92,6 @@
 4146 : KHR-GLES31.core.vertex_attrib_binding.advanced-bindingUpdate = FAIL
 4146 : KHR-GLES31.core.vertex_attrib_binding.advanced-largeStrideAndOffsetsNewAndLegacyAPI = FAIL

-// Draw indirect:
-3564 VULKAN : KHR-GLES31.core.draw_indirect.* = SKIP

 // Explicit uniform locations: triggers ASSERT.
 4132 : KHR-GLES31.core.explicit_uniform_location.* = SKIP
@@ -119,6 +117,11 @@
 4124 VULKAN : KHR-GLES31.core.layout_binding.image2D_layout_binding_imageLoad_FragmentShader = SKIP
 4124 VULKAN : KHR-GLES31.core.layout_binding.image2D_layout_binding_imageLoad_VertexShader = SKIP

+
+// Fails on Pixel2 and Pixel2 XL
+4159 VULKAN PIXEL2ORXL : KHR-GLES31.core.draw_indirect.advanced-twoPass-transformFeedback-elements = FAIL
+4159 VULKAN PIXEL2ORXL : KHR-GLES31.core.draw_indirect.advanced-twoPass-transformFeedback-arrays = FAIL
+
 // Passing on recent drivers:
 3726 VULKAN ANDROID : KHR-GLES31.core.shader_atomic_counters.* = FAIL
 3726 VULKAN ANDROID : KHR-GLES31.core.shader_atomic_counters.advanced-usage-* = SKIP