Android: Add/update MaliG710 expectations and tests

Fixed End2End tests causing valiadation errors where
VK_EXT_primitives_generated_query was being enabled without enabling
VK_EXT_transform_feedback.

Consolidated the DEQP-GLES3 expectations for the
functional.transform_feedback* tests, updated some changed
test names.

These test expectations were collected from the 43.0 driver
version.

Bug: b/285628492
Bug: angleproject:8212
Change-Id: I224a2eec33ee56b7303d17aebd998de65354106c
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4626241
Reviewed-by: Ian Elliott <ianelliott@google.com>
Reviewed-by: Mark Łobodziński <mark@lunarg.com>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Mark Łobodziński <mark@lunarg.com>
diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
index 4656aad..2d8df40 100644
--- a/src/tests/angle_end2end_tests_expectations.txt
+++ b/src/tests/angle_end2end_tests_expectations.txt
@@ -652,7 +652,7 @@
 // ARM drivers cannot support xfb emulation because they lack support for the
 // vertexPipelineStoresAndAtomics Vulkan feature.  The tests that force-enable this feature are
 // skipped.
-7376 PIXEL6 VULKAN : *_EmulateTransformFeedback_NoSupportsTransformFeedbackExtension_NoSupportsGeometryStreamsCapability = SKIP
+7376 PIXEL6 VULKAN : *_EmulateTransformFeedback_NoSupportsTransformFeedbackExtension_NoSupportsPrimitivesGeneratedQuery_NoSupportsGeometryStreamsCapability = SKIP
 
 // Crashing in Mali shader compiler
 217922015 PIXEL6 VULKAN : GLSLTest_ES3.NestedPowFromUniform/* = SKIP
@@ -956,7 +956,7 @@
 
 7112 SWIFTSHADER : TransformFeedbackTest.BaseInstance/* = SKIP
 7112 PIXEL4ORXL VULKAN : TransformFeedbackTest.BaseInstance/* = SKIP
-7112 VULKAN : TransformFeedbackTest.BaseInstance/ES3_Vulkan_EmulateTransformFeedback_NoSupportsTransformFeedbackExtension_NoSupportsGeometryStreamsCapability = SKIP
+7112 VULKAN : TransformFeedbackTest.BaseInstance/ES3_Vulkan_EmulateTransformFeedback_NoSupportsTransformFeedbackExtension_NoSupportsPrimitivesGeneratedQuery_NoSupportsGeometryStreamsCapability = SKIP
 
 // ASAN flaky timeouts and crashes with Win / Vulkan / Swiftshader
 6965 ASAN WIN VULKAN SWIFTSHADER : MipmapTest* = SKIP
@@ -1312,67 +1312,71 @@
 
 // MaliG710 crashes
 8212 MALIG710 VULKAN : BufferSubDataTest.MapInvalidateThenBufferSubData/* = SKIP
+8212 MALIG710 VULKAN : ImageTest.SourceNativeClientBufferTargetRenderbuffer/* = SKIP
+8212 MALIG710 VULKAN : ImageTestES3.SourceAHBMipTarget2DMip/* = SKIP
+8212 MALIG710 VULKAN : ImageTestES3.SourceAHBMipTarget2DMipGenerateMipmap/* = SKIP
 8212 MALIG710 VULKAN : PixelLocalStorageTest.DrawStateReset/* = SKIP
 8212 MALIG710 VULKAN : PixelLocalStorageTestES31.DrawStateReset/* = SKIP
 8212 MALIG710 VULKAN : ProgramInterfaceTestES31.ReloadFromCacheShouldNotCrash/* = SKIP
 
-
 // MaliG710 non-crash failures:
 8212 MALIG710 VULKAN : ExternalBufferTestES31.BufferSubData/* = SKIP
 8212 MALIG710 VULKAN : ExternalBufferTestES31.DispatchCompute/* = SKIP
-8212 MALIG710 VULKAN : ExternalBufferTestES31.MapBufferDoesNotCauseOrphaning/* = SKIP
 8212 MALIG710 VULKAN : ExternalBufferTestES31.MapBuffer/* = SKIP
+8212 MALIG710 VULKAN : ExternalBufferTestES31.MapBufferDoesNotCauseOrphaning/* = SKIP
 8212 MALIG710 VULKAN : ExternalBufferTestES31.SubDataDoesNotCauseOrphaning/* = SKIP
-8212 MALIG710 VULKAN : FramebufferTest_ES31.MultipleTextureMultisampleResolveWithBlitMultipleResolvesAttachment1First/* = SKIP
+8212 MALIG710 VULKAN : FramebufferFetchES31.DrawNonFetchDrawFetchInStorageBuffer_ARM/* = SKIP
+8212 MALIG710 VULKAN : FramebufferFetchES31.DrawNonFetchDrawFetchInStorageBuffer_Coherent/* = SKIP
+8212 MALIG710 VULKAN : FramebufferFetchES31.DrawNonFetchDrawFetchInStorageBufferThenClear_ARM/* = SKIP
+8212 MALIG710 VULKAN : FramebufferFetchES31.DrawNonFetchDrawFetchInStorageBufferThenClear_Coherent/* = SKIP
 8212 MALIG710 VULKAN : FramebufferTest_ES31.MultipleTextureMultisampleResolveWithBlitMultipleResolves/* = SKIP
+8212 MALIG710 VULKAN : FramebufferTest_ES31.MultipleTextureMultisampleResolveWithBlitMultipleResolvesAttachment1First/* = SKIP
 8212 MALIG710 VULKAN : FramebufferTest_ES31.MultisampleResolveWithBlitThenDrawAttachment1/* = SKIP
+8212 MALIG710 VULKAN : ImageTest.ANGLEExtensionAvailability/* = SKIP
+8212 MALIG710 VULKAN : ImageTestES3.SourceAHBCubeTargetCube/* = SKIP
 8212 MALIG710 VULKAN : ImageTestES31.SourceAHBCubeArrayTargetCubeArray/* = SKIP
-8212 MALIG710 VULKAN : ImageTestES3.RGBXAHBImportMultipleLayers/* = SKIP
+8212 MALIG710 VULKAN : MultisampledRenderToTextureES31Test.BlitFramebufferAttachment1/* = SKIP
+8212 MALIG710 VULKAN : MultisampledRenderToTextureES31Test.MixedMultisampledAndMultisampledRenderToTexture/* = SKIP
+8212 MALIG710 VULKAN : MultisampledRenderToTextureES31Test.RenderbufferBlitFramebufferAttachment1/* = SKIP
+8212 MALIG710 VULKAN : MultisampledRenderToTextureWithAdvancedBlendTest.ClearThenDraw/* = SKIP
+8212 MALIG710 VULKAN : MultisampledRenderToTextureWithAdvancedBlendTest.LoadThenDraw/* = SKIP
+8212 MALIG710 VULKAN : MultisampledRenderToTextureWithAdvancedBlendTest.RenderbufferClearThenDraw/* = SKIP
+8212 MALIG710 VULKAN : MultisampledRenderToTextureWithAdvancedBlendTest.RenderbufferLoadThenDraw/* = SKIP
+8212 MALIG710 VULKAN : OcclusionQueriesTestES3.UnresolveNotCounted/* = SKIP
 8212 MALIG710 VULKAN : ProgramPipelineTest31.ImageUniforms/* = SKIP
+8212 MALIG710 VULKAN : RobustBufferAccessBehaviorTest.DrawElementsIndexOutOfRangeWithDynamicDraw/* = SKIP
+8212 MALIG710 VULKAN : RobustBufferAccessBehaviorTest.DrawElementsIndexOutOfRangeWithStaticDraw/* = SKIP
+8212 MALIG710 VULKAN : Texture2DTestES3.TexStorage2DCycleThroughYuvAndRgbSources/* = SKIP
+8212 MALIG710 VULKAN : Texture2DTestES3.TexStorage2DCycleThroughYuvSourcesNoData/* = SKIP
+8212 MALIG710 VULKAN : Texture2DTestES3.TexStorage2DLargeYuvTextureCount/* = SKIP
+8212 MALIG710 VULKAN : Texture2DTestES3.TexStorage2DSimultaneousUseOfMultipleYuvSourcesNoData/* = SKIP
+8212 MALIG710 VULKAN : Texture2DTestES3YUV.TexStorage2DYuvFilterModes/* = SKIP
+8212 MALIG710 VULKAN : TransformFeedbackTest.BaseInstance/* = SKIP
 8212 MALIG710 VULKAN : TransformFeedbackTest.BufferRebinding/* = SKIP
-8212 MALIG710 VULKAN : TransformFeedbackTestES32.MultiPrimitivesGeneratedVsRasterizerDiscard/* = SKIP
-8212 MALIG710 VULKAN : TransformFeedbackTestES32.PrimitivesGeneratedVsIndirectDraw/* = SKIP
-8212 MALIG710 VULKAN : TransformFeedbackTestES32.PrimitivesGeneratedVsRasterizerDiscardAndFramebufferChange/* = SKIP
-8212 MALIG710 VULKAN : TransformFeedbackTestES32.PrimitivesGeneratedVsRasterizerDiscard/* = SKIP
-8212 MALIG710 VULKAN : TransformFeedbackTestIOBlocks.Separate/* = SKIP
 8212 MALIG710 VULKAN : TransformFeedbackTest.OffsetResetOnBeginTransformFeedback/* = SKIP
 8212 MALIG710 VULKAN : TransformFeedbackTest.Overrun/* = SKIP
 8212 MALIG710 VULKAN : TransformFeedbackTest.OverrunWithMultiplePauseAndResume/* = SKIP
-8212 MALIG710 VULKAN : TransformFeedbackTest.OverrunWithPauseAndResume/* = SKIP
 8212 MALIG710 VULKAN : TransformFeedbackTest.OverrunWithPause/* = SKIP
+8212 MALIG710 VULKAN : TransformFeedbackTest.OverrunWithPauseAndResume/* = SKIP
 8212 MALIG710 VULKAN : TransformFeedbackTest.RecordAndDraw/* = SKIP
-8212 MALIG710 VULKAN : TransformFeedbackTest.RecordAndDrawWithScissorTest/* = SKIP
+8212 MALIG710 VULKAN : TransformFeedbackTest.RecordTwiceWithBindingOffsetChange/* = SKIP
 8212 MALIG710 VULKAN : TransformFeedbackTest.TransformFeedbackPausedDrawThenResume/* = SKIP
-8212 MALIG710 VULKAN : TransformFeedbackTest.UseAsUBOThenUpdateThenCapture/* = SKIP
+8212 MALIG710 VULKAN : TransformFeedbackTestIOBlocks.Separate/* = SKIP
 8212 MALIG710 VULKAN : TransformFeedbackWithDepthBufferTest.RecordAndDrawWithDepthWriteEnabled/* = SKIP
-8212 MALIG710 VULKAN : VertexAttributeTestES31.MismatchingSignsChangingAttributeType/* = SKIP
-8212 MALIG710 VULKAN : VertexAttributeTestES31.MismatchingSignsChangingProgramType/* = SKIP
 8212 MALIG710 VULKAN : VulkanPerformanceCounterTest.MappingGpuReadOnlyBufferGhostsBuffer_Copy/* = SKIP
 8212 MALIG710 VULKAN : VulkanPerformanceCounterTest.MappingGpuReadOnlyBufferGhostsBuffer_SubData/* = SKIP
+8212 MALIG710 VULKAN : VulkanPerformanceCounterTest.RenderToTextureDepthStencilRenderbufferShouldNotLoad/* = SKIP
+8212 MALIG710 VULKAN : VulkanPerformanceCounterTest.RenderToTextureDepthStencilTextureShouldNotLoad/* = SKIP
+8212 MALIG710 VULKAN : VulkanPerformanceCounterTest.RenderToTextureUninitializedAndUnusedDepthStencil/* = SKIP
 8212 MALIG710 VULKAN : WebGLCompatibilityTest.FramebufferFloatColorAttachmentMRT/* = SKIP
 
 
-// Pixel 7 crashes
-8212 PIXEL7 VULKAN : GLSLTest_ES3.NestedPowFromUniform/* = SKIP
+// Pixel7 crashes:
 8212 PIXEL7 VULKAN : ImageTestES3.RGBXAHBImportMultipleLayers/* = SKIP
-8212 PIXEL7 VULKAN : ImageTestES3.SourceAHBMipTarget2DMip/* = SKIP
-8212 PIXEL7 VULKAN : ImageTestES3.SourceAHBMipTarget2DMipGenerateMipmap/* = SKIP
 
-// Pixel 7 non-crash failures
-8212 PIXEL7 VULKAN : ImageTestES3.SourceAHBCubeTargetCube/* = SKIP
+// Pixel7 non-crash failures:
 8212 PIXEL7 VULKAN : MultithreadingTestES3.MultithreadFenceDraw/* = SKIP
 8212 PIXEL7 VULKAN : MultithreadingTestES3.MultithreadFenceTexImage/* = SKIP
-8212 PIXEL7 VULKAN : VulkanPerformanceCounterTest.DepthStencilInvalidateAndClear/* = SKIP
-8212 PIXEL7 VULKAN : VulkanPerformanceCounterTest.DepthStencilInvalidateDisableDrawEnable/* = SKIP
-8212 PIXEL7 VULKAN : VulkanPerformanceCounterTest.DepthStencilInvalidateDisableEnableDraw/* = SKIP
-8212 PIXEL7 VULKAN : VulkanPerformanceCounterTest.DepthStencilInvalidateDrawDisableEnable/* = SKIP
-8212 PIXEL7 VULKAN : VulkanPerformanceCounterTest.DepthStencilInvalidateDrawDisableEnableInvalidateDraw/* = SKIP
-8212 PIXEL7 VULKAN : VulkanPerformanceCounterTest.DepthStencilInvalidateDrawDisableEnableInvalidate/* = SKIP
-8212 PIXEL7 VULKAN : VulkanPerformanceCounterTest.DepthStencilInvalidateDraw/* = SKIP
-8212 PIXEL7 VULKAN : VulkanPerformanceCounterTest.DepthStencilInvalidate/* = SKIP
-8212 PIXEL7 VULKAN : VulkanPerformanceCounterTest.DepthStencilInvalidateSub/* = SKIP
-8212 PIXEL7 VULKAN : VulkanPerformanceCounterTest.DisableDrawInvalidateEnable/* = SKIP
-8212 PIXEL7 VULKAN : VulkanPerformanceCounterTest.ReadOnlyDepthBufferLayout/* = SKIP
 
 // Please do not add expectations below this line,
 // so that TIMEOUT expectations above don't override more precise SKIP expectations
diff --git a/src/tests/deqp_support/deqp_gles3_test_expectations.txt b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
index 363dd4d..77bc96e 100644
--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -517,11 +517,6 @@
 3677 VULKAN NVIDIA NOSAN : dEQP-GLES3.functional.fragment_out.array.uint* = FAIL
 3677 VULKAN NVIDIA NOSAN : dEQP-GLES3.functional.fragment_out.random.* = FAIL
 
-// Transform Feedback
-4666 VULKAN NVIDIA : dEQP-GLES3.functional.transform_feedback.array_element.interleaved.* = SKIP
-4666 VULKAN NVIDIA : dEQP-GLES3.functional.transform_feedback.array_element.separate.* = SKIP
-4666 VULKAN NVIDIA : dEQP-GLES3.functional.transform_feedback.random.* = SKIP
-
 // Flat shading:
 3430 VULKAN NVIDIA : dEQP-GLES3.functional.rasterization.flatshading.* = FAIL
 
@@ -756,24 +751,6 @@
 6528 PIXEL4ORXL GLES : dEQP-GLES3.functional.transform_feedback.random_full_array_capture.* = FAIL
 7838 PIXEL4ORXL GLES : dEQP-GLES3.functional.shaders.function.global_variable_aliasing_* = FAIL
 
-// Pixel 6 expectations
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*separate*float = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*separate*int = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*separate*mat2 = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*separate*vec2 = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*separate*vec3 = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*separate*vec4 = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*interleaved*float = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*interleaved*int = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*interleaved*vec2 = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*interleaved*vec3 = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*interleaved*vec4 = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element*interleaved*mat2* = FAIL
-
-// A little over half of the following fail in a non-clear manner:
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.random.interleaved.* = FAIL
-6917 PIXEL6 VULKAN : dEQP-GLES3.functional.transform_feedback.random.separate.* = FAIL
-
 6709 LINUX NVIDIA GTX1660 VULKAN : dEQP-GLES3.functional.shaders.random.all_features.fragment.26 = FAIL
 6709 LINUX NVIDIA GTX1660 VULKAN : dEQP-GLES3.functional.shaders.random.all_features.fragment.31 = FAIL
 
@@ -836,6 +813,8 @@
 8157 GALAXYS23 VULKAN : dEQP-GLES3.functional.shaders.random.swizzle.fragment.* = SKIP
 8157 GALAXYS23 VULKAN : dEQP-GLES3.functional.shaders.random.texture.* = SKIP
 8157 GALAXYS23 VULKAN : dEQP-GLES3.functional.shaders.random.trigonometric.fragment.* = SKIP
-8157 GALAXYS23 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element.interleaved.* = SKIP
-8157 GALAXYS23 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element.separate.* = SKIP
-8157 GALAXYS23 VULKAN : dEQP-GLES3.functional.transform_feedback.random.* = SKIP
+
+// VK_EXT_transform_feedback doesn't support capturing array elements and a waiver exists
+4140 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element.interleaved.* = FAIL
+4140 VULKAN : dEQP-GLES3.functional.transform_feedback.array_element.separate.* = FAIL
+4140 VULKAN : dEQP-GLES3.functional.transform_feedback.random.* = FAIL
diff --git a/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt b/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
index c72f716..ab2a867 100644
--- a/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt
@@ -284,3 +284,7 @@
 8157 GALAXYS23 VULKAN : KHR-GLES31.core.shader_bitfield_operation.* = SKIP
 8157 GALAXYS23 VULKAN : KHR-GLES31.core.texture_cube_map_array.color_depth_attachments = SKIP
 8157 GALAXYS23 VULKAN : KHR-GLES31.core.texture_storage_multisample.FunctionalTests.blitting_multisampled_depth_attachment = SKIP
+
+// Mali G710
+8212 MALIG710 VULKAN : KHR-GLES31.core.texture_border_clamp.Texture2DDC32FLinear = FAIL
+8212 MALIG710 VULKAN : KHR-GLES31.core.texture_border_clamp.Texture2DDC16Linear = FAIL
diff --git a/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt b/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt
index 92fc149..675ccfe 100644
--- a/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_khr_gles3_test_expectations.txt
@@ -80,3 +80,6 @@
 
 // Samsung Galaxy S23
 8157 GALAXYS23 VULKAN : KHR-GLES3.shaders.function.global_variable_aliasing_fragment = SKIP
+
+// Mali G710
+8212 MALIG710 VULKAN : KHR-GLES3.number_parsing.* = FAIL
diff --git a/src/tests/gl_tests/DrawBuffersTest.cpp b/src/tests/gl_tests/DrawBuffersTest.cpp
index 4d82023..555ee29 100644
--- a/src/tests/gl_tests/DrawBuffersTest.cpp
+++ b/src/tests/gl_tests/DrawBuffersTest.cpp
@@ -1670,6 +1670,7 @@
                        ES2_METAL().enable(Feature::LimitMaxDrawBuffersForTesting),
                        ES2_VULKAN()
                            .disable(Feature::SupportsTransformFeedbackExtension)
+                           .disable(Feature::SupportsPrimitivesGeneratedQuery)
                            .disable(Feature::SupportsGeometryStreamsCapability)
                            .disable(Feature::EmulateTransformFeedback));
 
diff --git a/src/tests/gl_tests/TransformFeedbackTest.cpp b/src/tests/gl_tests/TransformFeedbackTest.cpp
index ea3eeea..471a457 100644
--- a/src/tests/gl_tests/TransformFeedbackTest.cpp
+++ b/src/tests/gl_tests/TransformFeedbackTest.cpp
@@ -507,8 +507,8 @@
 
     const std::array<uint32_t, 12> kInitialData = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11};
     const std::array<uint32_t, 12> kUpdateData  = {
-         0x12345678u, 0x9ABCDEF0u, 0x13579BDFu, 0x2468ACE0u, 0x23456781u, 0xABCDEF09u,
-         0x3579BDF1u, 0x468ACE02u, 0x34567812u, 0xBCDEF09Au, 0x579BDF13u, 0x68ACE024u,
+        0x12345678u, 0x9ABCDEF0u, 0x13579BDFu, 0x2468ACE0u, 0x23456781u, 0xABCDEF09u,
+        0x3579BDF1u, 0x468ACE02u, 0x34567812u, 0xBCDEF09Au, 0x579BDF13u, 0x68ACE024u,
     };
 
     GLBuffer buffer;
@@ -3749,9 +3749,9 @@
     constexpr size_t kCapturedVaryingsCount = 3;
     constexpr std::array<size_t, kCapturedVaryingsCount> kCaptureSizes = {8, 9, 4};
     const std::vector<float> kExpected[kCapturedVaryingsCount]         = {
-                {0.27, 0.30, 0.33, 0.36, 0.39, 0.42, 0.45, 0.48},
-                {0.63, 0.66, 0.69, 0.72, 0.75, 0.78, 0.81, 0.84, 0.87},
-                {0.25, 0.5, 0.75, 1.0},
+        {0.27, 0.30, 0.33, 0.36, 0.39, 0.42, 0.45, 0.48},
+        {0.63, 0.66, 0.69, 0.72, 0.75, 0.78, 0.81, 0.84, 0.87},
+        {0.25, 0.5, 0.75, 1.0},
     };
 
     ANGLE_GL_PROGRAM_TRANSFORM_FEEDBACK(program, kVS, kFS, tfVaryings, GL_INTERLEAVED_ATTRIBS);
@@ -3848,9 +3848,9 @@
     constexpr size_t kCapturedVaryingsCount                            = 3;
     constexpr std::array<size_t, kCapturedVaryingsCount> kCaptureSizes = {1, 2, 1};
     const std::vector<float> kExpected[kCapturedVaryingsCount]         = {
-                {0.25},
-                {0.5, 0.75},
-                {1.0},
+        {0.25},
+        {0.5, 0.75},
+        {1.0},
     };
 
     ANGLE_GL_PROGRAM_TRANSFORM_FEEDBACK(program, kVS, kFS, tfVaryings, GL_SEPARATE_ATTRIBS);
@@ -4396,6 +4396,7 @@
 ANGLE_INSTANTIATE_TEST_ES3_AND(TransformFeedbackTest,
                                ES3_VULKAN()
                                    .disable(Feature::SupportsTransformFeedbackExtension)
+                                   .disable(Feature::SupportsPrimitivesGeneratedQuery)
                                    .disable(Feature::SupportsGeometryStreamsCapability)
                                    .enable(Feature::EmulateTransformFeedback));
 
@@ -4403,6 +4404,7 @@
 ANGLE_INSTANTIATE_TEST_ES3_AND(TransformFeedbackLifetimeTest,
                                ES3_VULKAN()
                                    .disable(Feature::SupportsTransformFeedbackExtension)
+                                   .disable(Feature::SupportsPrimitivesGeneratedQuery)
                                    .disable(Feature::SupportsGeometryStreamsCapability)
                                    .enable(Feature::EmulateTransformFeedback));
 
@@ -4410,6 +4412,7 @@
 ANGLE_INSTANTIATE_TEST_ES31_AND(TransformFeedbackTestES31,
                                 ES31_VULKAN()
                                     .disable(Feature::SupportsTransformFeedbackExtension)
+                                    .disable(Feature::SupportsPrimitivesGeneratedQuery)
                                     .disable(Feature::SupportsGeometryStreamsCapability)
                                     .enable(Feature::EmulateTransformFeedback));
 
@@ -4417,6 +4420,7 @@
 ANGLE_INSTANTIATE_TEST_ES31_AND(TransformFeedbackTestIOBlocks,
                                 ES31_VULKAN()
                                     .disable(Feature::SupportsTransformFeedbackExtension)
+                                    .disable(Feature::SupportsPrimitivesGeneratedQuery)
                                     .disable(Feature::SupportsGeometryStreamsCapability)
                                     .enable(Feature::EmulateTransformFeedback));
 
@@ -4427,6 +4431,7 @@
 ANGLE_INSTANTIATE_TEST_ES3_AND(TransformFeedbackWithDepthBufferTest,
                                ES3_VULKAN()
                                    .disable(Feature::SupportsTransformFeedbackExtension)
+                                   .disable(Feature::SupportsPrimitivesGeneratedQuery)
                                    .disable(Feature::SupportsGeometryStreamsCapability)
                                    .enable(Feature::EmulateTransformFeedback));
 }  // anonymous namespace