Run TracePerfTests in WGL configs.

src/tests/perf_tests/ANGLEPerfTest.cpp

@@ -348,12 +348,10 @@ std::string RenderTestParams::backend() const
     {
         case angle::GLESDriverType::AngleEGL:
             break;
+        case angle::GLESDriverType::SystemWGL:
         case angle::GLESDriverType::SystemEGL:
             strstr << "_native";
             break;
-        case angle::GLESDriverType::SystemWGL:
-            strstr << "_wgl";
-            break;
         default:
             assert(0);
             return "_unk";

src/tests/perf_tests/DrawCallPerfParams.h

@@ -85,6 +85,16 @@ ParamsT EGL(const ParamsT &in)
     out.driver  = angle::GLESDriverType::SystemEGL;
     return out;
 }
+
+template <typename ParamsT>
+ParamsT Native(const ParamsT &in)
+{
+#if defined(ANGLE_PLATFORM_WINDOWS)
+    return WGL(in);
+#else
+    return EGL(in);
+#endif
+}
 }  // namespace params
 
 #endif  // TESTS_PERF_TESTS_DRAW_CALL_PERF_PARAMS_H_

src/tests/perf_tests/TracePerfTest.cpp

@@ -104,10 +104,18 @@ class TracePerfTest : public ANGLERenderTest, public ::testing::WithParamInterfa
 TracePerfTest::TracePerfTest()
     : ANGLERenderTest("TracePerf", GetParam()), mStartFrame(0), mEndFrame(0)
 {
-    // TODO(anglebug.com/4533) This fails after the upgrade to the 26.20.100.7870 driver.
-    if (IsWindows() && IsIntel() &&
-        GetParam().getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE &&
-        GetParam().testID == RestrictedTraceID::manhattan_10)
+    const TracePerfParams &param = GetParam();
+
+    // TODO: http://anglebug.com/4533 This fails after the upgrade to the 26.20.100.7870 driver.
+    if (IsWindows() && IsIntel() && param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE &&
+        param.testID == RestrictedTraceID::manhattan_10)
+    {
+        mSkipTest = true;
+    }
+
+    // TODO: http://anglebug.com/4731 Fails on older Intel drivers. Passes in newer.
+    if (IsWindows() && IsIntel() && param.driver != GLESDriverType::AngleEGL &&
+        param.testID == RestrictedTraceID::angry_birds_2_1500)
     {
         mSkipTest = true;
     }
@@ -361,7 +369,7 @@ using P = TracePerfParams;
 
 std::vector<P> gTestsWithID =
     CombineWithValues({P()}, AllEnums<RestrictedTraceID>(), CombineTestID);
-std::vector<P> gTestsWithRenderer = CombineWithFuncs(gTestsWithID, {Vulkan<P>, EGL<P>});
+std::vector<P> gTestsWithRenderer = CombineWithFuncs(gTestsWithID, {Vulkan<P>, Native<P>});
 ANGLE_INSTANTIATE_TEST_ARRAY(TracePerfTest, gTestsWithRenderer);
 
 }  // anonymous namespace

util/windows/WGLWindow.cpp

@@ -77,6 +77,7 @@ bool WGLWindow::initializeGL(OSWindow *osWindow,
 {
     if (driverType != angle::GLESDriverType::SystemWGL)
     {
+        std::cerr << "WGLWindow requires angle::GLESDriverType::SystemWGL.\n";
         return false;
     }