diff options
| author | epenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 08:40:17 +0000 |
|---|---|---|
| committer | epenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 08:40:17 +0000 |
| commit | a9f0cfdfe8b1d11dd6d7afeff9d7943266c8fad1 (patch) | |
| tree | 17c2e6d0cad1343f58260db59b5d24bdb4e2bc2d /cc | |
| parent | 1e47cd6dca99f70bc51f10661cf72f89099afd40 (diff) | |
| download | chromium_src-a9f0cfdfe8b1d11dd6d7afeff9d7943266c8fad1.zip chromium_src-a9f0cfdfe8b1d11dd6d7afeff9d7943266c8fad1.tar.gz chromium_src-a9f0cfdfe8b1d11dd6d7afeff9d7943266c8fad1.tar.bz2 | |
cc: Add compositor name for easier GPU debugging.
Allows for custom name to be passed to GPU process,
where it can be used for debugging.
BUG=181711
Review URL: https://chromiumcodereview.appspot.com/15673005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/output/gl_renderer.cc | 2 | ||||
| -rw-r--r-- | cc/trees/layer_tree_settings.cc | 3 | ||||
| -rw-r--r-- | cc/trees/layer_tree_settings.h | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc index 1afb384..b89c91a 100644 --- a/cc/output/gl_renderer.cc +++ b/cc/output/gl_renderer.cc @@ -146,7 +146,7 @@ bool GLRenderer::Initialize() { if (!context_->makeContextCurrent()) return false; - context_->pushGroupMarkerEXT("CompositorContext"); + context_->pushGroupMarkerEXT(Settings().compositor_name.c_str()); std::string extensions_string = UTF16ToASCII(context_->getString(GL_EXTENSIONS)); diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc index a68e7e1..422dbc8 100644 --- a/cc/trees/layer_tree_settings.cc +++ b/cc/trees/layer_tree_settings.cc @@ -55,7 +55,8 @@ LayerTreeSettings::LayerTreeSettings() highp_threshold_min(0), force_direct_layer_drawing(false), strict_layer_property_change_checking(false), - use_map_image(false) { + use_map_image(false), + compositor_name("ChromiumCompositor") { // TODO(danakj): Renable surface caching when we can do it more realiably. // crbug.com/170713 cache_render_pass_contents = false; diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h index 7229055..e7c0f45 100644 --- a/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h @@ -5,6 +5,8 @@ #ifndef CC_TREES_LAYER_TREE_SETTINGS_H_ #define CC_TREES_LAYER_TREE_SETTINGS_H_ +#include <string> + #include "base/basictypes.h" #include "cc/base/cc_export.h" #include "cc/debug/layer_tree_debug_state.h" @@ -60,6 +62,7 @@ class CC_EXPORT LayerTreeSettings { bool force_direct_layer_drawing; // With Skia GPU backend. bool strict_layer_property_change_checking; bool use_map_image; + std::string compositor_name; LayerTreeDebugState initial_debug_state; }; |