Vulkan: Fix setupDraw when VK_EXT_transform_feedback is not enabled

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -841,6 +841,7 @@ angle::Result ContextVk::setupDraw(const gl::Context *context,
     // Flush any relevant dirty bits.
     for (size_t dirtyBit : dirtyBits)
     {
+        ASSERT(mGraphicsDirtyBitHandlers[dirtyBit]);
         ANGLE_TRY((this->*mGraphicsDirtyBitHandlers[dirtyBit])(context, *commandBufferOut));
     }
 
@@ -1026,6 +1027,7 @@ angle::Result ContextVk::setupDispatch(const gl::Context *context,
     // Flush any relevant dirty bits.
     for (size_t dirtyBit : dirtyBits)
     {
+        ASSERT(mComputeDirtyBitHandlers[dirtyBit]);
         ANGLE_TRY((this->*mComputeDirtyBitHandlers[dirtyBit])(context, *commandBufferOut));
     }
 
@@ -2749,7 +2751,10 @@ void ContextVk::onDrawFramebufferChange(FramebufferVk *framebufferVk)
 
 void ContextVk::invalidateCurrentTransformFeedbackBuffers()
 {
-    mGraphicsDirtyBits.set(DIRTY_BIT_TRANSFORM_FEEDBACK_BUFFERS);
+    if (getFeatures().supportsTransformFeedbackExtension.enabled)
+    {
+        mGraphicsDirtyBits.set(DIRTY_BIT_TRANSFORM_FEEDBACK_BUFFERS);
+    }
     if (getFeatures().emulateTransformFeedback.enabled)
     {
         mGraphicsDirtyBits.set(DIRTY_BIT_DESCRIPTOR_SETS);

src/tests/gl_tests/DrawBuffersTest.cpp

@@ -641,8 +641,10 @@ TEST_P(DrawBuffersTestES3, 2DArrayTextures)
 
 // Use this to select which configurations (e.g. which renderer, which GLES major version) these
 // tests should be run against.
-ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(DrawBuffersTest);
-
+ANGLE_INSTANTIATE_TEST(DrawBuffersTest,
+                       ANGLE_ALL_TEST_PLATFORMS_ES2,
+                       ANGLE_ALL_TEST_PLATFORMS_ES3,
+                       WithNoTransformFeedback(ES2_VULKAN()));
 ANGLE_INSTANTIATE_TEST_ES3(DrawBuffersWebGL2Test);
 
 ANGLE_INSTANTIATE_TEST_ES3(DrawBuffersTestES3);

src/tests/test_utils/angle_test_configs.cpp

@@ -196,6 +196,15 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
         stream << "_CommandGraph";
     }
 
+    if (pp.eglParameters.transformFeedbackFeature == EGL_FALSE)
+    {
+        stream << "_NoTransformFeedback";
+    }
+    else if (pp.eglParameters.transformFeedbackFeature == EGL_TRUE)
+    {
+        stream << "_TransformFeedback";
+    }
+
     return stream;
 }
 

src/tests/test_utils/angle_test_configs.h

@@ -213,6 +213,14 @@ inline PlatformParameters WithNoCommandGraph(const PlatformParameters &params)
     withNoCommandGraph.eglParameters.commandGraphFeature = EGL_FALSE;
     return withNoCommandGraph;
 }
+
+inline PlatformParameters WithNoTransformFeedback(const PlatformParameters &params)
+{
+    PlatformParameters withNoTransformFeedback                     = params;
+    withNoTransformFeedback.eglParameters.transformFeedbackFeature = EGL_FALSE;
+    return withNoTransformFeedback;
+}
+
 }  // namespace angle
 
 #endif  // ANGLE_TEST_CONFIGS_H_

util/EGLPlatformParameters.h

@@ -59,6 +59,7 @@ struct EGLPlatformParameters
     EGLint debugLayersEnabled               = EGL_DONT_CARE;
     EGLint contextVirtualization            = EGL_DONT_CARE;
     EGLint commandGraphFeature              = EGL_DONT_CARE;
+    EGLint transformFeedbackFeature         = EGL_DONT_CARE;
     angle::PlatformMethods *platformMethods = nullptr;
 };
 

util/EGLWindow.cpp

@@ -182,6 +182,12 @@ bool EGLWindow::initializeDisplay(OSWindow *osWindow,
         disabledFeatureOverrides.push_back("command_graph");
     }
 
+    if (params.transformFeedbackFeature == EGL_FALSE)
+    {
+        disabledFeatureOverrides.push_back("supports_transform_feedback_extension");
+        disabledFeatureOverrides.push_back("emulate_transform_feedback");
+    }
+
     if (!disabledFeatureOverrides.empty())
     {
         if (strstr(extensionString, "EGL_ANGLE_feature_control") == nullptr)