Add Gpu Tracing to Ganesh

src/gpu/gl/GrGpuGL.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGpuGL.h"
 #include "GrGLStencilBuffer.h"
 #include "GrGLPath.h"
 #include "GrGLShaderBuilder.h"
 #include "GrTemplates.h"
 #include "GrTypes.h"
 #include "SkStrokeRec.h"
 #include "SkTemplates.h"
 
+#include <stdio.h>
+
 #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X)
 #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X)
 
 #define SKIP_CACHE_CHECK    true
 
 #if GR_GL_CHECK_ALLOC_WITH_GET_ERROR
     #define CLEAR_ERROR_BEFORE_ALLOC(iface)   GrGLClearErr(iface)
     #define GL_ALLOC_CALL(iface, call)        GR_GL_CALL_NOERRCHECK(iface, call)
     #define CHECK_ALLOC_ERROR(iface)          GR_GL_GET_ERROR(iface)
 #else
@@ skipping 2626 matching lines @@
             if(!SkIRect::IntersectsNoEmptyCheck(dstRect, srcRect)) {
                 return true;
             }
         } else {
             return true;
         }
     }
     return INHERITED::onCanCopySurface(dst, src, srcRect, dstPoint);
 }
 
-void GrGpuGL::onInstantGpuTraceEvent(const char* marker) {
+void GrGpuGL::onAddGpuTraceMarker() {
     if (this->caps()->gpuTracingSupport()) {
-        // GL_CALL(InsertEventMarker(0, marker));
+        SkTDArray<GpuTraceMarker>* markerArray = this->getActiveTraceMarkers();
+        SkString markerString = getTraceString(markerArray, 0, markerArray->count());
+        //(void) markerString;
+        printf("\n%s\n", markerString.c_str());

[bsalomon, 2014/03/17 17:50:38]

I assume this is just leftover debugging stuff

[egdaniel, 2014/03/17 19:49:12]

Yeah again a bunch of debug stuff throughout code which obviously will be
removed once everything all nice.
On 2014/03/17 17:50:38, bsalomon wrote:

+       // GL_CALL(PushGroupMarker(0, markerString.c_str()));
     }
 }
 
-void GrGpuGL::onPushGpuTraceEvent(const char* marker) {
+void GrGpuGL::onRemoveGpuTraceMarker() {
     if (this->caps()->gpuTracingSupport()) {
-        // GL_CALL(PushGroupMarker(0, marker));
+        //GL_CALL(PopGroupMarker());
     }
 }
-
-void GrGpuGL::onPopGpuTraceEvent() {
-    if (this->caps()->gpuTracingSupport()) {
-        // GL_CALL(PopGroupMarker());
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 GrGLAttribArrayState* GrGpuGL::HWGeometryState::bindArrayAndBuffersToDraw(
                                                 GrGpuGL* gpu,
                                                 const GrGLVertexBuffer* vbuffer,
                                                 const GrGLIndexBuffer* ibuffer) {
     SkASSERT(NULL != vbuffer);
     GrGLAttribArrayState* attribState;
 
     // We use a vertex array if we're on a core profile and the verts are in a VBO.
@@ skipping 13 matching lines @@
             this->setVertexArrayID(gpu, 0);
         }
         int attrCount = gpu->glCaps().maxVertexAttributes();
         if (fDefaultVertexArrayAttribState.count() != attrCount) {
             fDefaultVertexArrayAttribState.resize(attrCount);
         }
         attribState = &fDefaultVertexArrayAttribState;
     }
     return attribState;
 }