Add Gpu Tracing to Ganesh

src/gpu/GrInOrderDrawBuffer.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrInOrderDrawBuffer_DEFINED
 #define GrInOrderDrawBuffer_DEFINED
 
@@ skipping 150 matching lines @@
                                GrSurface* src,
                                const SkIRect& srcRect,
                                const SkIPoint& dstPoint)  SK_OVERRIDE;
     virtual bool onCanCopySurface(GrSurface* dst,
                                   GrSurface* src,
                                   const SkIRect& srcRect,
                                   const SkIPoint& dstPoint) SK_OVERRIDE;
 
     bool quickInsideClip(const SkRect& devBounds);
 
-    virtual void onInstantGpuTraceEvent(const char* marker) SK_OVERRIDE;
-    virtual void onPushGpuTraceEvent(const char* marker) SK_OVERRIDE;
-    virtual void onPopGpuTraceEvent() SK_OVERRIDE;
-
+    virtual void didAddGpuTraceMarker() SK_OVERRIDE {};

[bsalomon, 2014/03/20 16:32:53]

don't need ;s

+    virtual void didRemoveGpuTraceMarker() SK_OVERRIDE {};
 
     // Attempts to concat instances from info onto the previous draw. info must represent an
     // instanced draw. The caller must have already recorded a new draw state and clip if necessary.
     int concatInstancedDraw(const DrawInfo& info);
 
     // we lazily record state and clip changes in order to skip clips and states that have no
     // effect.
     bool needsNewState() const;
     bool needsNewClip() const;
 
@@ skipping 21 matching lines @@
 
     SkSTArray<kCmdPreallocCnt, uint8_t, true>                          fCmds;
     GrSTAllocator<kDrawPreallocCnt, DrawRecord>                        fDraws;
     GrSTAllocator<kStatePreallocCnt, StencilPath>                      fStencilPaths;
     GrSTAllocator<kStatePreallocCnt, DrawPath>                         fDrawPaths;
     GrSTAllocator<kStatePreallocCnt, GrDrawState::DeferredState>       fStates;
     GrSTAllocator<kClearPreallocCnt, Clear>                            fClears;
     GrSTAllocator<kCopySurfacePreallocCnt, CopySurface>                fCopySurfaces;
     GrSTAllocator<kClipPreallocCnt, SkClipStack>                       fClips;
     GrSTAllocator<kClipPreallocCnt, SkIPoint>                          fClipOrigins;
+    SkTArray<GrTraceMarkerSet, false>                                  fGpuCmdMarkers;
 
     GrDrawTarget*                   fDstGpu;
 
     bool                            fClipSet;
 
     enum ClipProxyState {
         kUnknown_ClipProxyState,
         kValid_ClipProxyState,
         kInvalid_ClipProxyState
     };
@@ skipping 12 matching lines @@
         // caller may conservatively over reserve vertices / indices.
         // we release unused space back to allocator if possible
         // can only do this if there isn't an intervening pushGeometrySource()
         size_t                          fUsedPoolVertexBytes;
         size_t                          fUsedPoolIndexBytes;
     };
     SkSTArray<kGeoPoolStatePreAllocCnt, GeometryPoolState> fGeoPoolStateStack;
 
     virtual bool       isIssued(uint32_t drawID) { return drawID != fDrawID; }
 
+    void addToCmdBuffer(uint8_t cmd);
+
     bool                            fFlushing;
     uint32_t                        fDrawID;
 
     typedef GrDrawTarget INHERITED;
 };
 
 #endif