Add a perf test for render-to-texture.

This perf test focuses on the hotspot we have in Framebuffer:: checkStatus. It's exactly the same as the standard draw call benchmark, but binds a Framebuffer before rendering. BUG=angleproject:1388 Change-Id: Icc7a99e399f469d765bf1ac6abe0562977b9a39d Reviewed-on: https://chromium-review.googlesource.com/348956Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Add a perf test for render-to-texture.
193c671d · Jamie Madill · Commit Bot · 9de84a5d · 193c671d
Commit 193c671d authored Jun 09, 2016 by Jamie Madill Committed by Commit Bot Jun 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 42 additions and 23 deletions

DrawCallPerf.cpp src/tests/perf_tests/DrawCallPerf.cpp +42 -23

No files found.
--- a/src/tests/perf_tests/DrawCallPerf.cpp
+++ b/src/tests/perf_tests/DrawCallPerf.cpp
@@ -26,9 +26,6 @@ struct DrawCallPerfParams final : public RenderTestParams
        minorVersion = 0;
        windowWidth = 256;
        windowHeight = 256;
-        iterations = 50;
-        numTris = 1;
-        runTimeSeconds = 10.0;
    }

    std::string suffix() const override
@@ -42,6 +39,11 @@ struct DrawCallPerfParams final : public RenderTestParams
            strstr << "_validation_only";
        }

+        if (useFBO)
+        {
+            strstr << "_render_to_texture";
+        }
+
        if (eglParameters.deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE)
        {
            strstr << "_null";
@@ -50,9 +52,10 @@ struct DrawCallPerfParams final : public RenderTestParams
        return strstr.str();
    }

-    unsigned int iterations;
-    double runTimeSeconds;
-    int numTris;
+    unsigned int iterations = 50;
+    double runTimeSeconds   = 10.0;
+    int numTris             = 1;
+    bool useFBO             = false;
 };

 std::ostream &operator<<(std::ostream &os, const DrawCallPerfParams &params)
@@ -72,16 +75,14 @@ class DrawCallPerfBenchmark : public ANGLERenderTest,
    void drawBenchmark() override;

  private:
-    GLuint mProgram;
-    GLuint mBuffer;
-    int mNumTris;
+    GLuint mProgram = 0;
+    GLuint mBuffer  = 0;
+    GLuint mFBO     = 0;
+    GLuint mTexture = 0;
+    int mNumTris    = GetParam().numTris;
 };

-DrawCallPerfBenchmark::DrawCallPerfBenchmark()
-    : ANGLERenderTest("DrawCallPerf", GetParam()),
-      mProgram(0),
-      mBuffer(0),
-      mNumTris(GetParam().numTris)
+DrawCallPerfBenchmark::DrawCallPerfBenchmark() : ANGLERenderTest("DrawCallPerf", GetParam())
 {
    mRunTimeSeconds = GetParam().runTimeSeconds;
 }
@@ -155,6 +156,17 @@ void DrawCallPerfBenchmark::initializeBenchmark()
    glUniform1f(glGetUniformLocation(mProgram, "uScale"), scale);
    glUniform1f(glGetUniformLocation(mProgram, "uOffset"), offset);

+    if (params.useFBO)
+    {
+        glGenFramebuffers(1, &mFBO);
+        glBindFramebuffer(GL_FRAMEBUFFER, mFBO);
+        glGenTextures(1, &mTexture);
+        glBindTexture(GL_TEXTURE_2D, mTexture);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindow()->getWidth(), getWindow()->getHeight(),
+                     0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr);
+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mTexture, 0);
+    }
+
    ASSERT_GL_NO_ERROR();
 }

@@ -162,6 +174,8 @@ void DrawCallPerfBenchmark::destroyBenchmark()
 {
    glDeleteProgram(mProgram);
    glDeleteBuffers(1, &mBuffer);
+    glDeleteTextures(1, &mTexture);
+    glDeleteFramebuffers(1, &mFBO);
 }

 void DrawCallPerfBenchmark::drawBenchmark()
@@ -180,24 +194,27 @@ void DrawCallPerfBenchmark::drawBenchmark()

 using namespace egl_platform;

-DrawCallPerfParams DrawCallPerfD3D11Params(bool useNullDevice)
+DrawCallPerfParams DrawCallPerfD3D11Params(bool useNullDevice, bool renderToTexture)
 {
    DrawCallPerfParams params;
    params.eglParameters = useNullDevice ? D3D11_NULL() : D3D11();
+    params.useFBO        = renderToTexture;
    return params;
 }

-DrawCallPerfParams DrawCallPerfD3D9Params(bool useNullDevice)
+DrawCallPerfParams DrawCallPerfD3D9Params(bool useNullDevice, bool renderToTexture)
 {
    DrawCallPerfParams params;
    params.eglParameters = useNullDevice ? D3D9_NULL() : D3D9();
+    params.useFBO        = renderToTexture;
    return params;
 }

-DrawCallPerfParams DrawCallPerfOpenGLParams(bool useNullDevice)
+DrawCallPerfParams DrawCallPerfOpenGLParams(bool useNullDevice, bool renderToTexture)
 {
    DrawCallPerfParams params;
    params.eglParameters = useNullDevice ? OPENGL_NULL() : OPENGL();
+    params.useFBO        = renderToTexture;
    return params;
 }

@@ -217,12 +234,14 @@ TEST_P(DrawCallPerfBenchmark, Run)
 }

 ANGLE_INSTANTIATE_TEST(DrawCallPerfBenchmark,
-                       DrawCallPerfD3D11Params(false),
-                       DrawCallPerfD3D9Params(false),
-                       DrawCallPerfOpenGLParams(false),
-                       DrawCallPerfD3D11Params(true),
-                       DrawCallPerfD3D9Params(true),
-                       DrawCallPerfOpenGLParams(true),
+                       DrawCallPerfD3D9Params(false, false),
+                       DrawCallPerfD3D9Params(true, false),
+                       DrawCallPerfD3D11Params(false, false),
+                       DrawCallPerfD3D11Params(true, false),
+                       DrawCallPerfD3D11Params(true, true),
+                       DrawCallPerfOpenGLParams(false, false),
+                       DrawCallPerfOpenGLParams(true, false),
+                       DrawCallPerfOpenGLParams(true, true),
                       DrawCallPerfValidationOnly());

 } // namespace