Trace Tests: Disable timestamp queries.

This framebuffer changing timing code adds overhead so it should stay disabled unless turned on explicitly. This was causing a performance regression in the native benchmark for some trace tests like egypt. Bug: angleproject:4845 Change-Id: I51c77d544cae063ba185aa4f20d028d9ffa7a2ab Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2335021Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Trace Tests: Disable timestamp queries.
1780609d · Jamie Madill · Commit Bot · 515b0775 · 1780609d
Commit 1780609d authored Aug 03, 2020 by Jamie Madill Committed by Commit Bot Aug 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

TracePerfTest.cpp src/tests/perf_tests/TracePerfTest.cpp +4 -3

No files found.
--- a/src/tests/perf_tests/TracePerfTest.cpp
+++ b/src/tests/perf_tests/TracePerfTest.cpp
@@ -97,6 +97,7 @@ class TracePerfTest : public ANGLERenderTest, public ::testing::WithParamInterfa
    std::vector<TimeSample> mTimeline;

    std::string mStartingDirectory;
+    bool mUseTimestampQueries = false;
 };

 class TracePerfTest;
@@ -195,7 +196,7 @@ void TracePerfTest::destroyBenchmark()

 void TracePerfTest::sampleTime()
 {
-    if (mIsTimestampQueryAvailable)
+    if (mUseTimestampQueries)
    {
        GLint64 glTime;
        // glGetInteger64vEXT is exported by newer versions of the timer query extensions.
@@ -314,10 +315,10 @@ double TracePerfTest::getHostTimeFromGLTime(GLint64 glTime)
 // Triggered when the replay calls glBindFramebuffer.
 void TracePerfTest::onReplayFramebufferChange(GLenum target, GLuint framebuffer)
 {
-    if (!mIsTimestampQueryAvailable)
+    if (target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER)
        return;

-    if (target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER)
+    if (!mUseTimestampQueries)
        return;

    // We have at most one active timestamp query at a time. This code will end the current