Commit 6e36029d by Jamie Madill Committed by Commit Bot

Disable Mock ICD perf tests on Android.

Bug: angleproject:5084 Change-Id: Iafff2adbd8bfc2844c43ca31329f3f8be1250631 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2438193Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 2cace8f8
...@@ -415,6 +415,11 @@ TracePerfParams CombineTestID(const TracePerfParams &in, RestrictedTraceID id) ...@@ -415,6 +415,11 @@ TracePerfParams CombineTestID(const TracePerfParams &in, RestrictedTraceID id)
return out; return out;
} }
bool NoAndroidMockICD(const TracePerfParams &in)
{
return in.eglParameters.deviceType != EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE || !IsAndroid();
}
using namespace params; using namespace params;
using P = TracePerfParams; using P = TracePerfParams;
...@@ -422,6 +427,7 @@ std::vector<P> gTestsWithID = ...@@ -422,6 +427,7 @@ std::vector<P> gTestsWithID =
CombineWithValues({P()}, AllEnums<RestrictedTraceID>(), CombineTestID); CombineWithValues({P()}, AllEnums<RestrictedTraceID>(), CombineTestID);
std::vector<P> gTestsWithRenderer = std::vector<P> gTestsWithRenderer =
CombineWithFuncs(gTestsWithID, {Vulkan<P>, VulkanMockICD<P>, Native<P>}); CombineWithFuncs(gTestsWithID, {Vulkan<P>, VulkanMockICD<P>, Native<P>});
ANGLE_INSTANTIATE_TEST_ARRAY(TracePerfTest, gTestsWithRenderer); std::vector<P> gTestsWithoutMockICD = FilterWithFunc(gTestsWithRenderer, NoAndroidMockICD);
ANGLE_INSTANTIATE_TEST_ARRAY(TracePerfTest, gTestsWithoutMockICD);
} // anonymous namespace } // anonymous namespace
...@@ -307,6 +307,20 @@ std::vector<ParamT> CombineWithValues(const std::vector<ParamT> &in, ...@@ -307,6 +307,20 @@ std::vector<ParamT> CombineWithValues(const std::vector<ParamT> &in,
{ {
return CombineWithValues(in, std::begin(modifiers), std::end(modifiers), combine); return CombineWithValues(in, std::begin(modifiers), std::end(modifiers), combine);
} }
template <typename ParamT, typename FilterFunc>
std::vector<ParamT> FilterWithFunc(const std::vector<ParamT> &in, FilterFunc filter)
{
std::vector<ParamT> out;
for (const ParamT &param : in)
{
if (filter(param))
{
out.push_back(param);
}
}
return out;
}
} // namespace angle } // namespace angle
#define ANGLE_SKIP_TEST_IF(COND) \ #define ANGLE_SKIP_TEST_IF(COND) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment