Perf Tests: Make "offscreen" a common test param.

src/tests/perf_tests/ANGLEPerfTest.cpp

@@ -416,7 +416,7 @@ std::string RenderTestParams::backend() const
 
 std::string RenderTestParams::story() const
 {
-    return "";
+    return (surfaceType == SurfaceType::Offscreen ? "_offscreen" : "");
 }
 
 std::string RenderTestParams::backendAndStory() const

src/tests/perf_tests/ANGLEPerfTest.h

@@ -104,6 +104,12 @@ class ANGLEPerfTest : public testing::Test, angle::NonCopyable
     bool mRunning;
 };
 
+enum class SurfaceType
+{
+    Window,
+    Offscreen,
+};
+
 struct RenderTestParams : public angle::PlatformParameters
 {
     virtual ~RenderTestParams() {}
@@ -116,6 +122,7 @@ struct RenderTestParams : public angle::PlatformParameters
     EGLint windowHeight            = 64;
     unsigned int iterationsPerStep = 0;
     bool trackGpuTime              = false;
+    SurfaceType surfaceType        = SurfaceType::Window;
 };
 
 class ANGLERenderTest : public ANGLEPerfTest
@@ -190,8 +197,8 @@ namespace params
 template <typename ParamsT>
 ParamsT Offscreen(const ParamsT &input)
 {
-    ParamsT output   = input;
-    output.offscreen = true;
+    ParamsT output     = input;
+    output.surfaceType = SurfaceType::Offscreen;
     return output;
 }
 

src/tests/perf_tests/DrawCallPerf.cpp

@@ -205,7 +205,7 @@ void main()
     // Set the viewport
     glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
 
-    if (params.offscreen)
+    if (params.surfaceType == SurfaceType::Offscreen)
     {
         CreateColorFBO(getWindow()->getWidth(), getWindow()->getHeight(), &mFBOTexture, &mFBO);
     }

src/tests/perf_tests/DrawCallPerfParams.cpp

@@ -26,7 +26,6 @@ DrawCallPerfParams::DrawCallPerfParams()
 #endif
     runTimeSeconds = 10.0;
     numTris        = 1;
-    offscreen      = false;
 }
 
 DrawCallPerfParams::~DrawCallPerfParams() = default;
@@ -37,10 +36,5 @@ std::string DrawCallPerfParams::story() const
 
     strstr << RenderTestParams::story();
 
-    if (offscreen)
-    {
-        strstr << "_offscreen";
-    }
-
     return strstr.str();
 }

src/tests/perf_tests/DrawCallPerfParams.h

@@ -25,7 +25,6 @@ struct DrawCallPerfParams : public RenderTestParams
 
     double runTimeSeconds;
     int numTris;
-    bool offscreen;
 };
 
 namespace params

src/tests/perf_tests/DrawElementsPerf.cpp

@@ -148,7 +148,7 @@ void DrawElementsPerfBenchmark::initializeBenchmark()
     // Set the viewport
     glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
 
-    if (params.offscreen)
+    if (params.surfaceType == SurfaceType::Offscreen)
     {
         CreateColorFBO(getWindow()->getWidth(), getWindow()->getHeight(), &mTexture, &mFBO);
     }