Vulkan: Disable command graph by default.

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -1595,7 +1595,7 @@ void RendererVk::initFeatures(DisplayVk *displayVk, const ExtensionNameList &dev
     ANGLE_FEATURE_CONDITION((&mFeatures), disableFlippingBlitWithCommand,
                             IsAndroid() && isQualcomm);
 
-    ANGLE_FEATURE_CONDITION((&mFeatures), commandGraph, true);
+    ANGLE_FEATURE_CONDITION((&mFeatures), commandGraph, false);
 
     ANGLE_FEATURE_CONDITION(
         (&mFeatures), supportsExternalMemoryHost,

src/tests/test_utils/angle_test_configs.cpp

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

src/tests/test_utils/angle_test_configs.h

@@ -207,13 +207,6 @@ inline PlatformParameters WithNoFixture(const PlatformParameters &params)
     return withNoFixture;
 }
 
-inline PlatformParameters WithNoCommandGraph(const PlatformParameters &params)
-{
-    PlatformParameters withNoCommandGraph                = params;
-    withNoCommandGraph.eglParameters.commandGraphFeature = EGL_FALSE;
-    return withNoCommandGraph;
-}
-
 inline PlatformParameters WithNoTransformFeedback(const PlatformParameters &params)
 {
     PlatformParameters withNoTransformFeedback                     = params;

src/tests/test_utils/angle_test_instantiate.h

@@ -118,15 +118,13 @@ struct CombinedPrintToStringParamName
 
 #define ANGLE_ALL_TEST_PLATFORMS_ES2                                                               \
     ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES(), ES2_VULKAN(), ES2_VULKAN_SWIFTSHADER(), \
-        ES2_METAL(), WithNoCommandGraph(ES2_VULKAN())
+        ES2_METAL()
 
-#define ANGLE_ALL_TEST_PLATFORMS_ES3                                                   \
-    ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES(), ES3_VULKAN(), ES3_VULKAN_SWIFTSHADER(), \
-        WithNoCommandGraph(ES3_VULKAN())
+#define ANGLE_ALL_TEST_PLATFORMS_ES3 \
+    ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES(), ES3_VULKAN(), ES3_VULKAN_SWIFTSHADER()
 
-#define ANGLE_ALL_TEST_PLATFORMS_ES31                                                       \
-    ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES(), ES31_VULKAN(), ES31_VULKAN_SWIFTSHADER(), \
-        WithNoCommandGraph(ES31_VULKAN())
+#define ANGLE_ALL_TEST_PLATFORMS_ES31 \
+    ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES(), ES31_VULKAN(), ES31_VULKAN_SWIFTSHADER()
 
 #define ANGLE_ALL_TEST_PLATFORMS_NULL ES2_NULL(), ES3_NULL(), ES31_NULL()
 

util/EGLPlatformParameters.h

@@ -48,8 +48,8 @@ struct EGLPlatformParameters
     auto tie() const
     {
         return std::tie(renderer, majorVersion, minorVersion, deviceType, presentPath,
-                        debugLayersEnabled, contextVirtualization, commandGraphFeature,
-                        transformFeedbackFeature, platformMethods);
+                        debugLayersEnabled, contextVirtualization, transformFeedbackFeature,
+                        platformMethods);
     }
 
     EGLint renderer                         = EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE;
@@ -59,7 +59,6 @@ struct EGLPlatformParameters
     EGLint presentPath                      = EGL_DONT_CARE;
     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

@@ -173,15 +173,6 @@ bool EGLWindow::initializeDisplay(OSWindow *osWindow,
     std::vector<const char *> disabledFeatureOverrides;
     std::vector<const char *> enabledFeatureOverrides;
 
-    if (params.commandGraphFeature == EGL_TRUE)
-    {
-        enabledFeatureOverrides.push_back("command_graph");
-    }
-    else if (params.commandGraphFeature == EGL_FALSE)
-    {
-        disabledFeatureOverrides.push_back("command_graph");
-    }
-
     if (params.transformFeedbackFeature == EGL_FALSE)
     {
         disabledFeatureOverrides.push_back("supports_transform_feedback_extension");