Add draw call perf tests that use the driver.

Also moves some code to the cpp. Bug: angleproject:2747 Change-Id: I38468e6276d52d11d5751df6917c66f15ae61246 Reviewed-on: https://chromium-review.googlesource.com/1163822 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Frank Henigman <fjhenigman@chromium.org>

Add draw call perf tests that use the driver.
1bd4bfb0 · Jamie Madill · Commit Bot · 6ba9754f · 1bd4bfb0 · 1bd4bfb0
Commit 1bd4bfb0 authored Aug 03, 2018 by Jamie Madill Committed by Commit Bot Aug 07, 2018
Showing with 23 additions and 12 deletions

DrawCallPerf.cpp src/tests/perf_tests/DrawCallPerf.cpp +2 -0

DrawCallPerfParams.cpp src/tests/perf_tests/DrawCallPerfParams.cpp +15 -0

DrawCallPerfParams.h src/tests/perf_tests/DrawCallPerfParams.h +6 -12

No files found.
--- a/src/tests/perf_tests/DrawCallPerf.cpp
+++ b/src/tests/perf_tests/DrawCallPerf.cpp
@@ -184,10 +184,12 @@ ANGLE_INSTANTIATE_TEST(DrawCallPerfBenchmark,
                       DrawArrays(DrawCallPerfD3D11Params(false, false), false),
                       DrawArrays(DrawCallPerfD3D11Params(true, false), false),
                       DrawArrays(DrawCallPerfD3D11Params(true, true), false),
+                       DrawArrays(DrawCallPerfD3D11Params(false, false), true),
                       DrawArrays(DrawCallPerfD3D11Params(true, false), true),
                       DrawArrays(DrawCallPerfOpenGLOrGLESParams(false, false), false),
                       DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, false), false),
                       DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, true), false),
+                       DrawArrays(DrawCallPerfOpenGLOrGLESParams(false, false), true),
                       DrawArrays(DrawCallPerfOpenGLOrGLESParams(true, false), true),
                       DrawArrays(DrawCallPerfValidationOnly(), false),
                       DrawArrays(DrawCallPerfVulkanParams(true, false), true),

--- a/src/tests/perf_tests/DrawCallPerfParams.cpp
+++ b/src/tests/perf_tests/DrawCallPerfParams.cpp
@@ -11,6 +11,21 @@
 #include <sstream>
+DrawCallPerfParams::DrawCallPerfParams()
+{
+    majorVersion = 2;
+    minorVersion = 0;
+    windowWidth  = 256;
+    windowHeight = 256;
+    iterations     = 50;
+    runTimeSeconds = 10.0;
+    numTris        = 1;
+    useFBO         = false;
+}
+DrawCallPerfParams::~DrawCallPerfParams() = default;
 std::string DrawCallPerfParams::suffix() const
 {
    std::stringstream strstr;

--- a/src/tests/perf_tests/DrawCallPerfParams.h
+++ b/src/tests/perf_tests/DrawCallPerfParams.h
@@ -17,21 +17,15 @@
 struct DrawCallPerfParams : public RenderTestParams
 {
    // Common default options
-    DrawCallPerfParams()
+    DrawCallPerfParams();
-    {
+    virtual ~DrawCallPerfParams();
-        majorVersion = 2;
-        minorVersion = 0;
-        windowWidth  = 256;
-        windowHeight = 256;
-    }
-    virtual ~DrawCallPerfParams() {}
    std::string suffix() const override;
-    unsigned int iterations = 50;
+    unsigned int iterations;
-    double runTimeSeconds   = 10.0;
+    double runTimeSeconds;
-    int numTris             = 1;
+    int numTris;
-    bool useFBO             = false;
+    bool useFBO;
 };
 DrawCallPerfParams DrawCallPerfD3D11Params(bool useNullDevice, bool renderToTexture);