Vulkan: Enable async feature in end2end_tests.

src/tests/gl_tests/VulkanExternalImageTest.cpp

@@ -758,6 +758,10 @@ TEST_P(VulkanExternalImageTest, ShouldClearOpaqueFdWithSemaphores)
 {
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object_fd"));
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_semaphore_fd"));
+
+    // http://issuetracker.google.com/173004081
+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsLinux() && isAsyncCommandQueueFeatureEnabled());
+
     RunShouldClearWithSemaphoresTest<OpaqueFdTraits>(false, kDefaultImageCreateFlags,
                                                      kDefaultImageUsageFlags, isSwiftshader(),
                                                      enableDebugLayers());
@@ -770,6 +774,10 @@ TEST_P(VulkanExternalImageTest, ShouldClearOpaqueFdWithSemaphoresWithFlags)
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object_fd"));
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_semaphore_fd"));
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_ANGLE_memory_object_flags"));
+
+    // http://issuetracker.google.com/173004081
+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsLinux() && isAsyncCommandQueueFeatureEnabled());
+
     RunShouldClearWithSemaphoresTest<OpaqueFdTraits>(true, kDefaultImageCreateFlags,
                                                      kDefaultImageUsageFlags, isSwiftshader(),
                                                      enableDebugLayers());
@@ -781,6 +789,10 @@ TEST_P(VulkanExternalImageTest, ShouldClearOpaqueFdWithSemaphoresNoStorage)
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object_fd"));
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_semaphore_fd"));
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_ANGLE_memory_object_flags"));
+
+    // http://issuetracker.google.com/173004081
+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsLinux() && isAsyncCommandQueueFeatureEnabled());
+
     RunShouldClearWithSemaphoresTest<OpaqueFdTraits>(true, kDefaultImageCreateFlags,
                                                      kNoStorageImageUsageFlags, isSwiftshader(),
                                                      enableDebugLayers());
@@ -793,6 +805,10 @@ TEST_P(VulkanExternalImageTest, ShouldClearOpaqueFdWithSemaphoresMutableNoStorag
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object_fd"));
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_semaphore_fd"));
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_ANGLE_memory_object_flags"));
+
+    // http://issuetracker.google.com/173004081
+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsLinux() && isAsyncCommandQueueFeatureEnabled());
+
     RunShouldClearWithSemaphoresTest<OpaqueFdTraits>(true, kMutableImageCreateFlags,
                                                      kNoStorageImageUsageFlags, isSwiftshader(),
                                                      enableDebugLayers());
@@ -978,6 +994,10 @@ TEST_P(VulkanExternalImageTest, ShouldDrawOpaqueFdWithSemaphores)
 {
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object_fd"));
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_semaphore_fd"));
+
+    // http://issuetracker.google.com/173004081
+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsLinux() && isAsyncCommandQueueFeatureEnabled());
+
     runShouldDrawTest<OpaqueFdTraits>(isSwiftshader(), enableDebugLayers());
 }
 
@@ -1143,6 +1163,10 @@ TEST_P(VulkanExternalImageTest, WaitSemaphoresRetainsContentOpaqueFd)
 {
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_memory_object_fd"));
     ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_semaphore_fd"));
+
+    // http://issuetracker.google.com/173004081
+    ANGLE_SKIP_TEST_IF(IsVulkan() && IsIntel() && IsLinux() && isAsyncCommandQueueFeatureEnabled());
+
     runWaitSemaphoresRetainsContentTest<OpaqueFdTraits>(isSwiftshader(), enableDebugLayers());
 }
 

src/tests/test_utils/ANGLETest.h

@@ -512,6 +512,11 @@ class ANGLETestBase
                mCurrentParams->isSwiftshader();
     }
 
+    bool isAsyncCommandQueueFeatureEnabled() const
+    {
+        return mCurrentParams->eglParameters.asyncCommandQueueFeatureVulkan == EGL_TRUE;
+    }
+
     bool platformSupportsMultithreading() const;
 
   private:

src/tests/test_utils/angle_test_configs.cpp

@@ -234,6 +234,11 @@ std::ostream &operator<<(std::ostream &stream, const PlatformParameters &pp)
             break;
     }
 
+    if (pp.eglParameters.asyncCommandQueueFeatureVulkan == EGL_TRUE)
+    {
+        stream << "_AsyncQueue";
+    }
+
     if (pp.eglParameters.hasExplicitMemBarrierFeatureMtl == EGL_FALSE)
     {
         stream << "_NoMetalExplicitMemoryBarrier";

src/tests/test_utils/angle_test_configs.h

@@ -271,6 +271,13 @@ inline PlatformParameters WithEmulatedPrerotation(const PlatformParameters &para
     prerotation.eglParameters.emulatedPrerotation = rotation;
     return prerotation;
 }
+
+inline PlatformParameters WithAsyncCommandQueueFeatureVulkan(const PlatformParameters &params)
+{
+    PlatformParameters withAsyncCommandQueue                           = params;
+    withAsyncCommandQueue.eglParameters.asyncCommandQueueFeatureVulkan = EGL_TRUE;
+    return withAsyncCommandQueue;
+}
 }  // namespace angle
 
 #endif  // ANGLE_TEST_CONFIGS_H_

src/tests/test_utils/angle_test_instantiate.h

@@ -133,18 +133,21 @@ struct CombinedPrintToStringParamName
     INSTANTIATE_TEST_SUITE_P(, testName, testing::ValuesIn(::angle::FilterTestParams(valuesin)), \
                              testing::PrintToStringParamName())
 
-#define ANGLE_ALL_TEST_PLATFORMS_ES1 \
-    ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES(), ES1_VULKAN(), ES1_VULKAN_SWIFTSHADER()
+#define ANGLE_ALL_TEST_PLATFORMS_ES1                                                   \
+    ES1_D3D11(), ES1_OPENGL(), ES1_OPENGLES(), ES1_VULKAN(), ES1_VULKAN_SWIFTSHADER(), \
+        WithAsyncCommandQueueFeatureVulkan(ES1_VULKAN())
 
 #define ANGLE_ALL_TEST_PLATFORMS_ES2                                                               \
     ES2_D3D9(), ES2_D3D11(), ES2_OPENGL(), ES2_OPENGLES(), ES2_VULKAN(), ES2_VULKAN_SWIFTSHADER(), \
-        ES2_METAL()
+        ES2_METAL(), WithAsyncCommandQueueFeatureVulkan(ES2_VULKAN())
 
-#define ANGLE_ALL_TEST_PLATFORMS_ES3 \
-    ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES(), ES3_VULKAN(), ES3_VULKAN_SWIFTSHADER(), ES3_METAL()
+#define ANGLE_ALL_TEST_PLATFORMS_ES3                                                   \
+    ES3_D3D11(), ES3_OPENGL(), ES3_OPENGLES(), ES3_VULKAN(), ES3_VULKAN_SWIFTSHADER(), \
+        ES3_METAL(), WithAsyncCommandQueueFeatureVulkan(ES3_VULKAN())
 
-#define ANGLE_ALL_TEST_PLATFORMS_ES31 \
-    ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES(), ES31_VULKAN(), ES31_VULKAN_SWIFTSHADER()
+#define ANGLE_ALL_TEST_PLATFORMS_ES31                                                       \
+    ES31_D3D11(), ES31_OPENGL(), ES31_OPENGLES(), ES31_VULKAN(), ES31_VULKAN_SWIFTSHADER(), \
+        WithAsyncCommandQueueFeatureVulkan(ES31_VULKAN())
 
 #define ANGLE_ALL_TEST_PLATFORMS_NULL ES2_NULL(), ES3_NULL(), ES31_NULL()
 

util/EGLPlatformParameters.h

@@ -80,6 +80,7 @@ struct EGLPlatformParameters
     EGLint shaderStencilOutputFeature             = EGL_DONT_CARE;
     EGLint genMultipleMipsPerPassFeature          = EGL_DONT_CARE;
     uint32_t emulatedPrerotation                  = 0;  // Can be 0, 90, 180 or 270
+    EGLint asyncCommandQueueFeatureVulkan         = EGL_DONT_CARE;
     EGLint hasExplicitMemBarrierFeatureMtl        = EGL_DONT_CARE;
     EGLint hasCheapRenderPassFeatureMtl           = EGL_DONT_CARE;
     EGLint forceBufferGPUStorageFeatureMtl        = EGL_DONT_CARE;

util/EGLWindow.cpp

@@ -221,6 +221,13 @@ bool EGLWindow::initializeDisplay(OSWindow *osWindow,
             break;
     }
 
+    if (params.asyncCommandQueueFeatureVulkan == EGL_TRUE)
+    {
+        // TODO(jmadill): Update feature names. b/172704839
+        enabledFeatureOverrides.push_back("commandProcessor");
+        enabledFeatureOverrides.push_back("asynchronousCommandProcessing");
+    }
+
     if (params.hasExplicitMemBarrierFeatureMtl == EGL_FALSE)
     {
         disabledFeatureOverrides.push_back("has_explicit_mem_barrier_mtl");