From dac7005b877c7c1c6f36b6e298133dfc7b85b9c0 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Tue, 1 Sep 2015 08:19:46 -0700 Subject: Remove GrGpuTraceMarker hooks until we rethink the design TBR=bsalomon@google.com BUG=526308 Review URL: https://codereview.chromium.org/1323823003 --- src/gpu/GrGpu.h | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'src/gpu/GrGpu.h') diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h index 290e981dc3..08837ccde8 100644 --- a/src/gpu/GrGpu.h +++ b/src/gpu/GrGpu.h @@ -11,7 +11,6 @@ #include "GrPipelineBuilder.h" #include "GrProgramDesc.h" #include "GrStencil.h" -#include "GrTraceMarker.h" #include "GrXferProcessor.h" #include "SkPath.h" @@ -363,25 +362,6 @@ public: Stats* stats() { return &fStats; } - /** - * Called at start and end of gpu trace marking - * GR_CREATE_GPU_TRACE_MARKER(marker_str, target) will automatically call these at the start - * and end of a code block respectively - */ - void addGpuTraceMarker(const GrGpuTraceMarker* marker); - void removeGpuTraceMarker(const GrGpuTraceMarker* marker); - - /** - * Takes the current active set of markers and stores them for later use. Any current marker - * in the active set is removed from the active set and the targets remove function is called. - * These functions do not work as a stack so you cannot call save a second time before calling - * restore. Also, it is assumed that when restore is called the current active set of markers - * is empty. When the stored markers are added back into the active set, the targets add marker - * is called. - */ - void saveActiveTraceMarkers(); - void restoreActiveTraceMarkers(); - // creation and deletion of raw texture for testing // only to be used in GPU-specific tests virtual GrBackendObject createTestingOnlyBackendTexture(void* pixels, int w, int h, @@ -417,8 +397,6 @@ protected: *preference = SkTMax(*preference, elevation); } - const GrTraceMarkerSet& getActiveTraceMarkers() const { return fActiveTraceMarkers; } - Stats fStats; SkAutoTDelete fPathRendering; // Subclass must initialize this in its constructor. @@ -499,9 +477,6 @@ private: // clears target's entire stencil buffer to 0 virtual void clearStencil(GrRenderTarget* target) = 0; - virtual void didAddGpuTraceMarker() = 0; - virtual void didRemoveGpuTraceMarker() = 0; - void resetContext() { this->onResetContext(fResetBits); fResetBits = 0; @@ -516,10 +491,6 @@ private: ResetTimestamp fResetTimestamp; uint32_t fResetBits; - // To keep track that we always have at least as many debug marker adds as removes - int fGpuTraceMarkerCount; - GrTraceMarkerSet fActiveTraceMarkers; - GrTraceMarkerSet fStoredTraceMarkers; // The context owns us, not vice-versa, so this ptr is not ref'ed by Gpu. GrContext* fContext; -- cgit v1.2.3