Add perftest parameters for OpenGL

src/tests/perf_tests/BufferSubData.cpp

@@ -351,12 +351,31 @@ BufferSubDataParams BufferUpdateD3D9Params()
     return params;
 }
 
+BufferSubDataParams BufferUpdateOpenGLParams()
+{
+    BufferSubDataParams params;
+    params.glesMajorVersion = 2;
+    params.widowWidth = 512;
+    params.windowHeight = 512;
+    params.requestedRenderer = EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
+    params.deviceType = EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE;
+    params.vertexType = GL_FLOAT;
+    params.vertexComponentCount = 4;
+    params.vertexNormalized = GL_FALSE;
+    params.updateSize = 3000;
+    params.bufferSize = 40000000;
+    params.iterations = 2;
+    params.updateRate = 1;
+    return params;
+}
+
 TEST_P(BufferSubDataBenchmark, Run)
 {
     run();
 }
 
 ANGLE_INSTANTIATE_TEST(BufferSubDataBenchmark,
-                       BufferUpdateD3D11Params(), BufferUpdateD3D9Params());
+                       BufferUpdateD3D11Params(), BufferUpdateD3D9Params(),
+                       BufferUpdateOpenGLParams());
 
 } // namespace

src/tests/perf_tests/DrawCallPerf.cpp

@@ -179,7 +179,7 @@ DrawCallPerfParams DrawCallPerfValidationOnly()
     params.glesMajorVersion = 2;
     params.widowWidth = 256;
     params.windowHeight = 256;
-    params.requestedRenderer = EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE;
+    params.requestedRenderer = EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE;
     params.deviceType = EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE;
     params.iterations = 100;
     params.numTris = 0;
@@ -201,12 +201,29 @@ DrawCallPerfParams DrawCallPerfD3D9Params()
     return params;
 }
 
+DrawCallPerfParams DrawCallPerfOpenGLParams()
+{
+    DrawCallPerfParams params;
+    params.glesMajorVersion = 2;
+    params.widowWidth = 256;
+    params.windowHeight = 256;
+    params.requestedRenderer = EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
+    // TODO(cwallez) we can't require a null device with OpenGL so
+    // the benchmark is unfair for OpenGL.
+    // params.deviceType = EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE;
+    params.iterations = 50;
+    params.numTris = 1;
+    params.runTimeSeconds = 10.0;
+    return params;
+}
+
 TEST_P(DrawCallPerfBenchmark, Run)
 {
     run();
 }
 
 ANGLE_INSTANTIATE_TEST(DrawCallPerfBenchmark,
-                       DrawCallPerfD3D11Params(), DrawCallPerfD3D9Params(), DrawCallPerfValidationOnly());
+                       DrawCallPerfD3D11Params(), DrawCallPerfD3D9Params(),
+                       DrawCallPerfOpenGLParams(), DrawCallPerfValidationOnly());
 
 } // namespace

src/tests/perf_tests/PointSprites.cpp

@@ -217,6 +217,24 @@ PointSpritesParams D3D9Params()
     return params;
 }
 
+PointSpritesParams OpenGLParams()
+{
+    PointSpritesParams params;
+
+    params.glesMajorVersion = 2;
+    params.widowWidth = 1280;
+    params.windowHeight = 720;
+    params.requestedRenderer = EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
+    params.deviceType = EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE;
+
+    params.iterations = 10;
+    params.count = 10;
+    params.size = 3.0f;
+    params.numVaryings = 3;
+
+    return params;
+}
+
 } // namespace
 
 TEST_P(PointSpritesBenchmark, Run)
@@ -225,4 +243,4 @@ TEST_P(PointSpritesBenchmark, Run)
 }
 
 ANGLE_INSTANTIATE_TEST(PointSpritesBenchmark,
-                       D3D11Params(), D3D9Params());
+                       D3D11Params(), D3D9Params(), OpenGLParams());

src/tests/perf_tests/TexSubImage.cpp

@@ -286,6 +286,25 @@ TexSubImageParams D3D9Params()
     return params;
 }
 
+TexSubImageParams OpenGLParams()
+{
+    TexSubImageParams params;
+
+    params.glesMajorVersion = 2;
+    params.widowWidth = 512;
+    params.windowHeight = 512;
+    params.requestedRenderer = EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
+    params.deviceType = EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE;
+
+    params.imageWidth = 1024;
+    params.imageHeight = 1024;
+    params.subImageWidth = 64;
+    params.subImageHeight = 64;
+    params.iterations = 3;
+
+    return params;
+}
+
 } // namespace
 
 TEST_P(TexSubImageBenchmark, Run)
@@ -294,4 +313,4 @@ TEST_P(TexSubImageBenchmark, Run)
 }
 
 ANGLE_INSTANTIATE_TEST(TexSubImageBenchmark,
-                       D3D11Params(), D3D9Params());
+                       D3D11Params(), D3D9Params(), OpenGLParams());