Merge Group Markers into Chromium Traces.

cc/resources/scoped_gpu_raster.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/scoped_gpu_raster.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
 using gpu::gles2::GLES2Interface;
 
 namespace cc {
 
 ScopedGpuRaster::ScopedGpuRaster(ContextProvider* context_provider)
     : context_provider_(context_provider) {
   BeginGpuRaster();
 }
 
 ScopedGpuRaster::~ScopedGpuRaster() {
   EndGpuRaster();
 }
 
 void ScopedGpuRaster::BeginGpuRaster() {
   GLES2Interface* gl = context_provider_->ContextGL();
 
   // TODO(alokp): Use a trace macro to push/pop markers.
   // Using push/pop functions directly incurs cost to evaluate function
   // arguments even when tracing is disabled.
   gl->PushGroupMarkerEXT(0, "GpuRasterization");

[vmiura, 2015/05/12 21:47:41]

Markers and traces each add some overhead, and I think traces will get more
difficult to read with duplicate entries.

I'd like to suggest that we deprecate use of PushGroupMarkerEXT for Chromium
internal code, and keep only the TraceBeginCHROMIUM calls.

GPU logs can also use the TraceBeginCHROMIUM values instead of
PushGroupMarkerEXT values.

Later on we will be able to extend TraceCHROMIUM calls to pass additional JSON
data for viewing in the trace viewer.

+  gl->TraceBeginCHROMIUM("ScopedGpuRaster", "GpuRasterization");
 
   class GrContext* gr_context = context_provider_->GrContext();
   gr_context->resetContext();
 }
 
 void ScopedGpuRaster::EndGpuRaster() {
   class GrContext* gr_context = context_provider_->GrContext();
   gr_context->flush();
 
   GLES2Interface* gl = context_provider_->ContextGL();
 
   // Restore default GL unpack alignment.  TextureUploader expects this.
   gl->PixelStorei(GL_UNPACK_ALIGNMENT, 4);
 
   // TODO(alokp): Use a trace macro to push/pop markers.
   // Using push/pop functions directly incurs cost to evaluate function
   // arguments even when tracing is disabled.
+  gl->TraceEndCHROMIUM();
   gl->PopGroupMarkerEXT();
 }
 
 }  // namespace cc