summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-23 20:31:42 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-23 20:31:42 +0000
commit2ac620e51e2f79ce9b90dbd796b247ba9ca393fd (patch)
treeaec12caf9a9addc18030b508c34c52150943b9b8 /gpu
parent406aa0b444d6530bc178f143c37b65eb87c5e59a (diff)
downloadchromium_src-2ac620e51e2f79ce9b90dbd796b247ba9ca393fd.zip
chromium_src-2ac620e51e2f79ce9b90dbd796b247ba9ca393fd.tar.gz
chromium_src-2ac620e51e2f79ce9b90dbd796b247ba9ca393fd.tar.bz2
GPU: Fix latency tests
Latency tests require instrumenting where the SwapBuffers call is received, as opposed to where it is completed. Fix a regression introduced by r146621 in the latency tests by restoring the TRACE_EVENT placement. R=jbates BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10805022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 273df90..a3bf4bf 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -8241,6 +8241,11 @@ error::Error GLES2DecoderImpl::HandleSwapBuffers(
}
int this_frame_number = frame_number_++;
+ // TRACE_EVENT for gpu tests:
+ TRACE_EVENT_INSTANT2("test_gpu", "SwapBuffersLatency",
+ "GLImpl", static_cast<int>(gfx::GetGLImplementation()),
+ "width", (is_offscreen ? offscreen_size_.width() :
+ surface_->GetSize().width()));
TRACE_EVENT2("gpu", "GLES2DecoderImpl::HandleSwapBuffers",
"offscreen", is_offscreen,
"frame", this_frame_number);