| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2015 Google Inc. | 3 * Copyright 2015 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 #include "GrAtlasTextContext.h" | |
| 10 #include "GrBatchTest.h" | 9 #include "GrBatchTest.h" |
| 11 #include "GrColor.h" | 10 #include "GrColor.h" |
| 12 #include "GrDrawContext.h" | 11 #include "GrDrawContext.h" |
| 13 #include "GrDrawingManager.h" | 12 #include "GrDrawingManager.h" |
| 14 #include "GrOvalRenderer.h" | 13 #include "GrOvalRenderer.h" |
| 15 #include "GrPathRenderer.h" | 14 #include "GrPathRenderer.h" |
| 16 #include "GrRenderTarget.h" | 15 #include "GrRenderTarget.h" |
| 17 #include "GrRenderTargetPriv.h" | 16 #include "GrRenderTargetPriv.h" |
| 18 #include "GrResourceProvider.h" | 17 #include "GrResourceProvider.h" |
| 19 #include "GrStencilAndCoverTextContext.h" | |
| 20 #include "SkSurfacePriv.h" | 18 #include "SkSurfacePriv.h" |
| 21 | 19 |
| 22 #include "batches/GrBatch.h" | 20 #include "batches/GrBatch.h" |
| 23 #include "batches/GrDrawAtlasBatch.h" | 21 #include "batches/GrDrawAtlasBatch.h" |
| 24 #include "batches/GrDrawVerticesBatch.h" | 22 #include "batches/GrDrawVerticesBatch.h" |
| 25 #include "batches/GrRectBatchFactory.h" | 23 #include "batches/GrRectBatchFactory.h" |
| 26 #include "batches/GrNinePatch.h" // TODO Factory | 24 #include "batches/GrNinePatch.h" // TODO Factory |
| 27 | 25 |
| 26 #include "text/GrAtlasTextContext.h" |
| 27 #include "text/GrStencilAndCoverTextContext.h" |
| 28 |
| 28 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == fDrawingM
anager->getContext()) | 29 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == fDrawingM
anager->getContext()) |
| 29 #define RETURN_IF_ABANDONED if (fDrawingManager->abandoned()) { return; } | 30 #define RETURN_IF_ABANDONED if (fDrawingManager->abandoned()) { return; } |
| 30 #define RETURN_FALSE_IF_ABANDONED if (fDrawingManager->abandoned()) { return fa
lse; } | 31 #define RETURN_FALSE_IF_ABANDONED if (fDrawingManager->abandoned()) { return fa
lse; } |
| 31 #define RETURN_NULL_IF_ABANDONED if (fDrawingManager->abandoned()) { return nu
llptr; } | 32 #define RETURN_NULL_IF_ABANDONED if (fDrawingManager->abandoned()) { return nu
llptr; } |
| 32 | 33 |
| 33 class AutoCheckFlush { | 34 class AutoCheckFlush { |
| 34 public: | 35 public: |
| 35 AutoCheckFlush(GrDrawingManager* drawingManager) : fDrawingManager(drawingMa
nager) { | 36 AutoCheckFlush(GrDrawingManager* drawingManager) : fDrawingManager(drawingMa
nager) { |
| 36 SkASSERT(fDrawingManager); | 37 SkASSERT(fDrawingManager); |
| 37 } | 38 } |
| (...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 790 args.fAntiAlias = useCoverageAA; | 791 args.fAntiAlias = useCoverageAA; |
| 791 pr->drawPath(args); | 792 pr->drawPath(args); |
| 792 } | 793 } |
| 793 | 794 |
| 794 void GrDrawContext::drawBatch(GrPipelineBuilder* pipelineBuilder, GrDrawBatch* b
atch) { | 795 void GrDrawContext::drawBatch(GrPipelineBuilder* pipelineBuilder, GrDrawBatch* b
atch) { |
| 795 RETURN_IF_ABANDONED | 796 RETURN_IF_ABANDONED |
| 796 SkDEBUGCODE(this->validate();) | 797 SkDEBUGCODE(this->validate();) |
| 797 | 798 |
| 798 this->getDrawTarget()->drawBatch(*pipelineBuilder, batch); | 799 this->getDrawTarget()->drawBatch(*pipelineBuilder, batch); |
| 799 } | 800 } |
| OLD | NEW |