Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: src/gpu/GrContext.cpp

Issue 1277233002: Make folder for batches (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/gpu/GrBatch.cpp ('k') | src/gpu/GrDefaultPathRenderer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 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 "GrContext.h" 9 #include "GrContext.h"
10 10
11 #include "GrAARectRenderer.h" 11 #include "GrAARectRenderer.h"
12 #include "GrBatch.h"
13 #include "GrBatchFontCache.h" 12 #include "GrBatchFontCache.h"
14 #include "GrBatchTarget.h" 13 #include "GrBatchTarget.h"
15 #include "GrBatchTest.h" 14 #include "GrBatchTest.h"
16 #include "GrBufferedDrawTarget.h" 15 #include "GrBufferedDrawTarget.h"
17 #include "GrCaps.h" 16 #include "GrCaps.h"
18 #include "GrContextOptions.h" 17 #include "GrContextOptions.h"
19 #include "GrDefaultGeoProcFactory.h" 18 #include "GrDefaultGeoProcFactory.h"
20 #include "GrDrawContext.h" 19 #include "GrDrawContext.h"
21 #include "GrGpuResource.h" 20 #include "GrGpuResource.h"
22 #include "GrGpuResourcePriv.h" 21 #include "GrGpuResourcePriv.h"
(...skipping 18 matching lines...) Expand all
41 #include "SkDashPathPriv.h" 40 #include "SkDashPathPriv.h"
42 #include "SkConfig8888.h" 41 #include "SkConfig8888.h"
43 #include "SkGr.h" 42 #include "SkGr.h"
44 #include "SkRRect.h" 43 #include "SkRRect.h"
45 #include "SkStrokeRec.h" 44 #include "SkStrokeRec.h"
46 #include "SkSurfacePriv.h" 45 #include "SkSurfacePriv.h"
47 #include "SkTLazy.h" 46 #include "SkTLazy.h"
48 #include "SkTLS.h" 47 #include "SkTLS.h"
49 #include "SkTraceEvent.h" 48 #include "SkTraceEvent.h"
50 49
50 #include "batches/GrBatch.h"
51
51 #include "effects/GrConfigConversionEffect.h" 52 #include "effects/GrConfigConversionEffect.h"
52 #include "effects/GrDashingEffect.h" 53 #include "effects/GrDashingEffect.h"
53 #include "effects/GrSingleTextureEffect.h" 54 #include "effects/GrSingleTextureEffect.h"
54 55
55 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == this) 56 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == this)
56 #define RETURN_IF_ABANDONED if (fDrawingMgr.abandoned()) { return; } 57 #define RETURN_IF_ABANDONED if (fDrawingMgr.abandoned()) { return; }
57 #define RETURN_FALSE_IF_ABANDONED if (fDrawingMgr.abandoned()) { return false; } 58 #define RETURN_FALSE_IF_ABANDONED if (fDrawingMgr.abandoned()) { return false; }
58 #define RETURN_NULL_IF_ABANDONED if (fDrawingMgr.abandoned()) { return NULL; } 59 #define RETURN_NULL_IF_ABANDONED if (fDrawingMgr.abandoned()) { return NULL; }
59 60
60 61
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 ////////////////////////////////////////////////////////////////////////////// 755 //////////////////////////////////////////////////////////////////////////////
755 756
756 void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) { 757 void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) {
757 fGpu->addGpuTraceMarker(marker); 758 fGpu->addGpuTraceMarker(marker);
758 } 759 }
759 760
760 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) { 761 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) {
761 fGpu->removeGpuTraceMarker(marker); 762 fGpu->removeGpuTraceMarker(marker);
762 } 763 }
763 764
OLDNEW
« no previous file with comments | « src/gpu/GrBatch.cpp ('k') | src/gpu/GrDefaultPathRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698