Trace Tests: Clean up mock ICD skip condition.

Bug: angleproject:6090 Change-Id: I943eb35da56a24c5a2c9961eb458b9b6e27ea83a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3015515Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Trace Tests: Clean up mock ICD skip condition.
dc2d76cd · Jamie Madill · Angle LUCI CQ · 62398e82 · dc2d76cd
Commit dc2d76cd authored Jul 08, 2021 by Jamie Madill Committed by Angle LUCI CQ Jul 08, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 8 deletions

TracePerfTest.cpp src/tests/perf_tests/TracePerfTest.cpp +5 -8

No files found.
--- a/src/tests/perf_tests/TracePerfTest.cpp
+++ b/src/tests/perf_tests/TracePerfTest.cpp
@@ -1605,11 +1605,6 @@ TracePerfParams CombineTestID(const TracePerfParams &in, RestrictedTraceID id)
    return out;
 }

-bool NoAndroidMockICD(const TracePerfParams &in)
-{
-    return in.eglParameters.deviceType != EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE || !IsAndroid();
-}
-
 TracePerfParams CombineWithSurfaceType(const TracePerfParams &in, SurfaceType surfaceType)
 {
    TracePerfParams out = in;
@@ -1645,15 +1640,17 @@ void RegisterTraceTests()
    std::vector<ModifierFunc<P>> renderers = {Vulkan<P>, Native<P>};
    if (gEnableAllTraceTests)
    {
-        renderers.push_back(VulkanMockICD<P>);
+        if (!IsAndroid())
+        {
+            renderers.push_back(VulkanMockICD<P>);
+        }
        renderers.push_back(VulkanSwiftShader<P>);
    }

    PV testsWithID = CombineWithValues({P()}, AllEnums<RestrictedTraceID>(), CombineTestID);
    PV testsWithSurfaceType = CombineWithValues(testsWithID, surfaceTypes, CombineWithSurfaceType);
    PV testsWithRenderer    = CombineWithFuncs(testsWithSurfaceType, renderers);
-    PV testsWithoutMockICD  = FilterWithFunc(testsWithRenderer, NoAndroidMockICD);
-    PV filteredTests        = angle::FilterTestParams(testsWithoutMockICD);
+    PV filteredTests        = FilterTestParams(testsWithRenderer);

    for (const TracePerfParams &params : filteredTests)
    {