summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer
diff options
context:
space:
mode:
authorgeofflang@chromium.org <geofflang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-24 16:40:27 +0000
committergeofflang@chromium.org <geofflang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-24 16:40:27 +0000
commita36ed4839fe44ca37f7562ba8bc198b1d7812e6a (patch)
tree605d3ac1274083486fc578e6d3695a12526410ee /gpu/command_buffer
parentbe1fc67755ccb7bb65414b7c8c2af595f764d4f6 (diff)
downloadchromium_src-a36ed4839fe44ca37f7562ba8bc198b1d7812e6a.zip
chromium_src-a36ed4839fe44ca37f7562ba8bc198b1d7812e6a.tar.gz
chromium_src-a36ed4839fe44ca37f7562ba8bc198b1d7812e6a.tar.bz2
Rename gpu.SwapBuffers to gpu.PresentingFrame and add it to PostSubBuffer.
Depending on the GL implementation, PostSubBuffer may be called instead of SwapBuffers. Rename gpu.SwapBuffers to a more generic gpu.PresentingFrame and update all the tests that use the delay. BUG=359662 Review URL: https://codereview.chromium.org/240073008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index fdd08f4..3553a7a 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -7558,6 +7558,9 @@ error::Error GLES2DecoderImpl::HandlePixelStorei(
error::Error GLES2DecoderImpl::HandlePostSubBufferCHROMIUM(
uint32 immediate_data_size, const cmds::PostSubBufferCHROMIUM& c) {
TRACE_EVENT0("gpu", "GLES2DecoderImpl::HandlePostSubBufferCHROMIUM");
+ {
+ TRACE_EVENT_SYNTHETIC_DELAY("gpu.PresentingFrame");
+ }
if (!supports_post_sub_buffer_) {
LOCAL_SET_GL_ERROR(
GL_INVALID_OPERATION,
@@ -9066,7 +9069,7 @@ void GLES2DecoderImpl::DoSwapBuffers() {
"offscreen", is_offscreen,
"frame", this_frame_number);
{
- TRACE_EVENT_SYNTHETIC_DELAY("gpu.SwapBuffers");
+ TRACE_EVENT_SYNTHETIC_DELAY("gpu.PresentingFrame");
}
bool is_tracing;