| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2010 Google Inc. | 3 * Copyright 2010 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 | 10 |
| (...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 680 for (TMIter iter = fActiveTraceMarkers.begin(); iter != fActiveTraceMark
ers.end(); ++iter) { | 680 for (TMIter iter = fActiveTraceMarkers.begin(); iter != fActiveTraceMark
ers.end(); ++iter) { |
| 681 this->fStoredTraceMarkers.remove(*iter); | 681 this->fStoredTraceMarkers.remove(*iter); |
| 682 } | 682 } |
| 683 } | 683 } |
| 684 } | 684 } |
| 685 | 685 |
| 686 void GrDrawTarget::addGpuTraceMarker(const GrGpuTraceMarker* marker) { | 686 void GrDrawTarget::addGpuTraceMarker(const GrGpuTraceMarker* marker) { |
| 687 if (this->caps()->gpuTracingSupport()) { | 687 if (this->caps()->gpuTracingSupport()) { |
| 688 SkASSERT(fGpuTraceMarkerCount >= 0); | 688 SkASSERT(fGpuTraceMarkerCount >= 0); |
| 689 this->fActiveTraceMarkers.add(*marker); | 689 this->fActiveTraceMarkers.add(*marker); |
| 690 this->didAddGpuTraceMarker(); | |
| 691 ++fGpuTraceMarkerCount; | 690 ++fGpuTraceMarkerCount; |
| 692 } | 691 } |
| 693 } | 692 } |
| 694 | 693 |
| 695 void GrDrawTarget::removeGpuTraceMarker(const GrGpuTraceMarker* marker) { | 694 void GrDrawTarget::removeGpuTraceMarker(const GrGpuTraceMarker* marker) { |
| 696 if (this->caps()->gpuTracingSupport()) { | 695 if (this->caps()->gpuTracingSupport()) { |
| 697 SkASSERT(fGpuTraceMarkerCount >= 1); | 696 SkASSERT(fGpuTraceMarkerCount >= 1); |
| 698 this->fActiveTraceMarkers.remove(*marker); | 697 this->fActiveTraceMarkers.remove(*marker); |
| 699 this->didRemoveGpuTraceMarker(); | |
| 700 --fGpuTraceMarkerCount; | 698 --fGpuTraceMarkerCount; |
| 701 } | 699 } |
| 702 } | 700 } |
| 703 | 701 |
| 704 //////////////////////////////////////////////////////////////////////////////// | 702 //////////////////////////////////////////////////////////////////////////////// |
| 705 | 703 |
| 706 void GrDrawTarget::drawIndexedInstances(GrPrimitiveType type, | 704 void GrDrawTarget::drawIndexedInstances(GrPrimitiveType type, |
| 707 int instanceCount, | 705 int instanceCount, |
| 708 int verticesPerInstance, | 706 int verticesPerInstance, |
| 709 int indicesPerInstance, | 707 int indicesPerInstance, |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1243 bool GrClipTarget::setupClip(const SkRect* devBounds, | 1241 bool GrClipTarget::setupClip(const SkRect* devBounds, |
| 1244 GrDrawState::AutoRestoreEffects* are, | 1242 GrDrawState::AutoRestoreEffects* are, |
| 1245 GrDrawState::AutoRestoreStencil* ars, | 1243 GrDrawState::AutoRestoreStencil* ars, |
| 1246 GrClipMaskManager::ScissorState* scissorState) { | 1244 GrClipMaskManager::ScissorState* scissorState) { |
| 1247 return fClipMaskManager.setupClipping(this->getClip(), | 1245 return fClipMaskManager.setupClipping(this->getClip(), |
| 1248 devBounds, | 1246 devBounds, |
| 1249 are, | 1247 are, |
| 1250 ars, | 1248 ars, |
| 1251 scissorState); | 1249 scissorState); |
| 1252 } | 1250 } |
| OLD | NEW |