Merge Group Markers into Chromium Traces.

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 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 "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <stdio.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 12896 matching lines @@
     GLsizei length, const GLchar* marker) {
   if (!marker) {
     marker = "";
   }
   debug_marker_manager_.SetMarker(
       length ? std::string(marker, length) : std::string(marker));
 }
 
 void GLES2DecoderImpl::DoPushGroupMarkerEXT(
     GLsizei length, const GLchar* marker) {
+  // While deprecating Push/Pop Group Marker, mimic HandleTraceBeginCHROMIUM().
   if (!marker) {
     marker = "";
   }
   std::string name = length ? std::string(marker, length) : std::string(marker);
+
   debug_marker_manager_.PushGroup(name);
-  gpu_tracer_->Begin(TRACE_DISABLED_BY_DEFAULT("gpu_group_marker"), name,
-                     kTraceGroupMarker);
+  gpu_tracer_->Begin("GroupMarker", name, kTraceCHROMIUM);

[vmiura, 2015/06/25 00:41:57]

Could there be a stacking problem between traces and markers?
Should this just be made no-op?

[David Yen, 2015/06/25 17:40:35]

Done.

 }
 
 void GLES2DecoderImpl::DoPopGroupMarkerEXT(void) {
-  debug_marker_manager_.PopGroup();
-  gpu_tracer_->End(kTraceGroupMarker);
+  // While deprecating Push/Pop Group Marker, just call trace CHROMIUM ones.
+  if (gpu_tracer_->End(kTraceCHROMIUM)) {
+    debug_marker_manager_.PopGroup();
+  }
 }
 
 void GLES2DecoderImpl::DoBindTexImage2DCHROMIUM(
     GLenum target, GLint image_id) {
   TRACE_EVENT0("gpu", "GLES2DecoderImpl::DoBindTexImage2DCHROMIUM");
 
   if (target == GL_TEXTURE_CUBE_MAP) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_ENUM,
         "glBindTexImage2DCHROMIUM", "invalid target");
@@ skipping 88 matching lines @@
     return error::kInvalidArguments;
   }
 
   std::string category_name;
   std::string trace_name;
   if (!category_bucket->GetAsString(&category_name) ||
       !name_bucket->GetAsString(&trace_name)) {
     return error::kInvalidArguments;
   }
 
+  debug_marker_manager_.PushGroup(trace_name);
   if (!gpu_tracer_->Begin(category_name, trace_name, kTraceCHROMIUM)) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glTraceBeginCHROMIUM", "unable to create begin trace");
     return error::kNoError;
   }
   return error::kNoError;
 }
 
 void GLES2DecoderImpl::DoTraceEndCHROMIUM() {
+  debug_marker_manager_.PopGroup();
   if (!gpu_tracer_->End(kTraceCHROMIUM)) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
                        "glTraceEndCHROMIUM", "no trace begin found");
     return;
   }
 }
 
 void GLES2DecoderImpl::DoDrawBuffersEXT(
     GLsizei count, const GLenum* bufs) {
   if (count > static_cast<GLsizei>(group_->max_draw_buffers())) {
@@ skipping 648 matching lines @@
   }
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu