Fix the broken draw call perf test.

src/tests/perf_tests/DrawCallPerf.cpp

@@ -17,11 +17,6 @@ using namespace angle;
 namespace
 {
 
-EGLint NullDeviceType(bool useNullDevice)
-{
-    return useNullDevice ? EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE : EGL_DONT_CARE;
-}
-
 struct DrawCallPerfParams final : public RenderTestParams
 {
     // Common default options
@@ -189,31 +184,33 @@ void DrawCallPerfBenchmark::drawBenchmark()
     ASSERT_GL_NO_ERROR();
 }
 
+using namespace egl_platform;
+
 DrawCallPerfParams DrawCallPerfD3D11Params(bool useNullDevice)
 {
     DrawCallPerfParams params;
-    params.eglParameters = egl_platform::D3D11_NULL();
+    params.eglParameters = useNullDevice ? D3D11_NULL() : D3D11();
     return params;
 }
 
 DrawCallPerfParams DrawCallPerfD3D9Params(bool useNullDevice)
 {
     DrawCallPerfParams params;
-    params.eglParameters = egl_platform::DEFAULT_NULL();
+    params.eglParameters = useNullDevice ? D3D9_NULL() : D3D9();
     return params;
 }
 
 DrawCallPerfParams DrawCallPerfOpenGLParams(bool useNullDevice)
 {
     DrawCallPerfParams params;
-    params.eglParameters = egl_platform::D3D9_NULL();
+    params.eglParameters = useNullDevice ? OPENGL_NULL() : OPENGL();
     return params;
 }
 
 DrawCallPerfParams DrawCallPerfValidationOnly()
 {
     DrawCallPerfParams params;
-    params.eglParameters = egl_platform::OPENGL();
+    params.eglParameters = DEFAULT();
     params.iterations = 100;
     params.numTris = 0;
     params.runTimeSeconds = 5.0;

src/tests/test_utils/angle_test_configs.cpp

@@ -64,6 +64,9 @@ std::ostream &operator<<(std::ostream& stream, const PlatformParameters &pp)
       case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
         stream << "GLES";
         break;
+      case EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE:
+        stream << "DEFAULT";
+        break;
       default:
         UNREACHABLE();
         break;
@@ -108,10 +111,7 @@ namespace egl_platform
 
 EGLPlatformParameters DEFAULT()
 {
-    return EGLPlatformParameters(
-        EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE,
-        EGL_DONT_CARE, EGL_DONT_CARE,
-        EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE);
+    return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE);
 }
 
 EGLPlatformParameters DEFAULT_NULL()
@@ -303,6 +303,14 @@ EGLPlatformParameters OPENGL()
     return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE);
 }
 
+EGLPlatformParameters OPENGL_NULL()
+{
+    return EGLPlatformParameters(
+        EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE,
+        0, 0,
+        EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE);
+}
+
 EGLPlatformParameters OPENGLES()
 {
     return EGLPlatformParameters(EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE);

src/tests/test_utils/angle_test_configs.h

@@ -67,6 +67,7 @@ EGLPlatformParameters D3D11_FL10_0_REFERENCE();
 EGLPlatformParameters D3D11_FL9_3_REFERENCE();
 
 EGLPlatformParameters OPENGL();
+EGLPlatformParameters OPENGL_NULL();
 
 EGLPlatformParameters OPENGLES();