Run trace tests against Vulkan Mock ICD.

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -1252,13 +1252,19 @@ angle::Result TextureVk::ensureImageAllocated(ContextVk *contextVk, const vk::Fo
                        VK_IMAGE_USAGE_SAMPLED_BIT;
 
     // If the image has depth/stencil support, add those as possible usage.
-    if (contextVk->getRenderer()->hasImageFormatFeatureBits(
-            format.vkImageFormat, VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT))
+    RendererVk *renderer = contextVk->getRenderer();
+    if (format.actualImageFormat().hasDepthOrStencilBits())
     {
-        mImageUsageFlags |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
+        // Work around a bug in the Mock ICD:
+        // https://github.com/KhronosGroup/Vulkan-Tools/issues/445
+        if (renderer->hasImageFormatFeatureBits(format.vkImageFormat,
+                                                VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT))
+        {
+            mImageUsageFlags |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
+        }
     }
-    else if (contextVk->getRenderer()->hasImageFormatFeatureBits(
-                 format.vkImageFormat, VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT))
+    else if (renderer->hasImageFormatFeatureBits(format.vkImageFormat,
+                                                 VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT))
     {
         mImageUsageFlags |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
     }

src/tests/perf_tests/ANGLEPerfTest.cpp

@@ -800,6 +800,7 @@ std::vector<TraceEvent> &ANGLERenderTest::getTraceEventBuffer()
 
 void ANGLERenderTest::onErrorMessage(const char *errorMessage)
 {
+    abortTest();
     FAIL() << "Failing test because of unexpected internal ANGLE error:\n" << errorMessage << "\n";
 }
 

src/tests/perf_tests/DrawCallPerfParams.h

@@ -62,6 +62,14 @@ ParamsT Vulkan(const ParamsT &in)
 }
 
 template <typename ParamsT>
+ParamsT VulkanMockICD(const ParamsT &in)
+{
+    ParamsT out       = in;
+    out.eglParameters = angle::egl_platform::VULKAN_NULL();
+    return out;
+}
+
+template <typename ParamsT>
 ParamsT WGL(const ParamsT &in)
 {
     ParamsT out = in;

src/tests/perf_tests/TracePerfTest.cpp

@@ -244,6 +244,12 @@ void TracePerfTest::drawBenchmark()
         getGLWindow()->swap();
 
         endInternalTraceEvent(frameName);
+
+        // Check for abnormal exit.
+        if (!mRunning)
+        {
+            return;
+        }
     }
 
     ResetReplay(GetParam().testID);
@@ -412,7 +418,8 @@ using P = TracePerfParams;
 
 std::vector<P> gTestsWithID =
     CombineWithValues({P()}, AllEnums<RestrictedTraceID>(), CombineTestID);
-std::vector<P> gTestsWithRenderer = CombineWithFuncs(gTestsWithID, {Vulkan<P>, Native<P>});
+std::vector<P> gTestsWithRenderer =
+    CombineWithFuncs(gTestsWithID, {Vulkan<P>, VulkanMockICD<P>, Native<P>});
 ANGLE_INSTANTIATE_TEST_ARRAY(TracePerfTest, gTestsWithRenderer);
 
 }  // anonymous namespace