diff options
| author | dyen <dyen@chromium.org> | 2015-01-07 14:56:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-07 22:57:36 +0000 |
| commit | 52554adb44477b802d66105d8e345f1bead3810c (patch) | |
| tree | 39e98e9bbe9620ec11866f0becbad2ee5059b966 /webkit | |
| parent | 75755fafa44d82854d5beece5149ff6de22d0d2d (diff) | |
| download | chromium_src-52554adb44477b802d66105d8e345f1bead3810c.zip chromium_src-52554adb44477b802d66105d8e345f1bead3810c.tar.gz chromium_src-52554adb44477b802d66105d8e345f1bead3810c.tar.bz2 | |
Added GL_CHROMIUM_trace_marker feature as well as gpu_toplevel markers.
Added a GL_CHROMIUM_trace_marker extension which allows us to execute
GPU traces with an associated category and trace name. This feature
has been documented here and is also used for "gpu_toplevel" traces
so we can display traces for top level graphics contexts.
blink side: https://codereview.chromium.org/797273003/
R=vmiura@chromium.org
BUG=None
TEST=trybots
Review URL: https://codereview.chromium.org/780653007
Cr-Commit-Position: refs/heads/master@{#310399}
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/common/gpu/context_provider_in_process.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/common/gpu/context_provider_in_process.cc b/webkit/common/gpu/context_provider_in_process.cc index b02d961..9eb6e41 100644 --- a/webkit/common/gpu/context_provider_in_process.cc +++ b/webkit/common/gpu/context_provider_in_process.cc @@ -102,7 +102,8 @@ bool ContextProviderInProcess::BindToCurrentThread() { std::string unique_context_name = base::StringPrintf("%s-%p", debug_name_.c_str(), context3d_.get()); - context3d_->pushGroupMarkerEXT(unique_context_name.c_str()); + context3d_->traceBeginCHROMIUM("gpu_toplevel", + unique_context_name.c_str()); lost_context_callback_proxy_.reset(new LostContextCallbackProxy(this)); return true; |