| Index: src/gpu/GrGpu.cpp
|
| diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
|
| index 2fdfbc424200131b4f8ba1ad26a84b7dbe5966ba..48e39f41afd2c14abd35aea42591ef85f1e11db3 100644
|
| --- a/src/gpu/GrGpu.cpp
|
| +++ b/src/gpu/GrGpu.cpp
|
| @@ -45,7 +45,6 @@ GrVertices& GrVertices::operator =(const GrVertices& di) {
|
| GrGpu::GrGpu(GrContext* context)
|
| : fResetTimestamp(kExpiredTimestamp+1)
|
| , fResetBits(kAll_GrBackendState)
|
| - , fGpuTraceMarkerCount(0)
|
| , fContext(context) {
|
| }
|
|
|
| @@ -346,47 +345,6 @@ void GrGpu::resolveRenderTarget(GrRenderTarget* target) {
|
| this->onResolveRenderTarget(target);
|
| }
|
|
|
| -typedef GrTraceMarkerSet::Iter TMIter;
|
| -void GrGpu::saveActiveTraceMarkers() {
|
| - if (this->caps()->gpuTracingSupport()) {
|
| - SkASSERT(0 == fStoredTraceMarkers.count());
|
| - fStoredTraceMarkers.addSet(fActiveTraceMarkers);
|
| - for (TMIter iter = fStoredTraceMarkers.begin(); iter != fStoredTraceMarkers.end(); ++iter) {
|
| - this->removeGpuTraceMarker(&(*iter));
|
| - }
|
| - }
|
| -}
|
| -
|
| -void GrGpu::restoreActiveTraceMarkers() {
|
| - if (this->caps()->gpuTracingSupport()) {
|
| - SkASSERT(0 == fActiveTraceMarkers.count());
|
| - for (TMIter iter = fStoredTraceMarkers.begin(); iter != fStoredTraceMarkers.end(); ++iter) {
|
| - this->addGpuTraceMarker(&(*iter));
|
| - }
|
| - for (TMIter iter = fActiveTraceMarkers.begin(); iter != fActiveTraceMarkers.end(); ++iter) {
|
| - this->fStoredTraceMarkers.remove(*iter);
|
| - }
|
| - }
|
| -}
|
| -
|
| -void GrGpu::addGpuTraceMarker(const GrGpuTraceMarker* marker) {
|
| - if (this->caps()->gpuTracingSupport()) {
|
| - SkASSERT(fGpuTraceMarkerCount >= 0);
|
| - this->fActiveTraceMarkers.add(*marker);
|
| - this->didAddGpuTraceMarker();
|
| - ++fGpuTraceMarkerCount;
|
| - }
|
| -}
|
| -
|
| -void GrGpu::removeGpuTraceMarker(const GrGpuTraceMarker* marker) {
|
| - if (this->caps()->gpuTracingSupport()) {
|
| - SkASSERT(fGpuTraceMarkerCount >= 1);
|
| - this->fActiveTraceMarkers.remove(*marker);
|
| - this->didRemoveGpuTraceMarker();
|
| - --fGpuTraceMarkerCount;
|
| - }
|
| -}
|
| -
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|
| void GrGpu::draw(const DrawArgs& args, const GrVertices& vertices) {
|
|
|