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/GrInOrderCommandBuilder.cpp

Issue 1293563003: Put clear and discard into GrBatch. (Closed) Base URL: https://skia.googlesource.com/skia.git@protectedprepare
Patch Set: tiny 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/GrInOrderCommandBuilder.h ('k') | src/gpu/GrReorderCommandBuilder.h » ('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 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrInOrderCommandBuilder.h" 8 #include "GrInOrderCommandBuilder.h"
9 9
10 #include "GrBufferedDrawTarget.h" 10 #include "GrBufferedDrawTarget.h"
11 11
12 #include "GrColor.h" 12 #include "GrColor.h"
13 #include "SkPoint.h" 13 #include "SkPoint.h"
14 14
15 static bool path_fill_type_is_winding(const GrStencilSettings& pathStencilSettin gs) { 15 static bool path_fill_type_is_winding(const GrStencilSettings& pathStencilSettin gs) {
16 static const GrStencilSettings::Face pathFace = GrStencilSettings::kFront_Fa ce; 16 static const GrStencilSettings::Face pathFace = GrStencilSettings::kFront_Fa ce;
17 bool isWinding = kInvert_StencilOp != pathStencilSettings.passOp(pathFace); 17 bool isWinding = kInvert_StencilOp != pathStencilSettings.passOp(pathFace);
18 if (isWinding) { 18 if (isWinding) {
19 // Double check that it is in fact winding. 19 // Double check that it is in fact winding.
20 SkASSERT(kIncClamp_StencilOp == pathStencilSettings.passOp(pathFace)); 20 SkASSERT(kIncClamp_StencilOp == pathStencilSettings.passOp(pathFace));
21 SkASSERT(kIncClamp_StencilOp == pathStencilSettings.failOp(pathFace)); 21 SkASSERT(kIncClamp_StencilOp == pathStencilSettings.failOp(pathFace));
22 SkASSERT(0x1 != pathStencilSettings.writeMask(pathFace)); 22 SkASSERT(0x1 != pathStencilSettings.writeMask(pathFace));
23 SkASSERT(!pathStencilSettings.isTwoSided()); 23 SkASSERT(!pathStencilSettings.isTwoSided());
24 } 24 }
25 return isWinding; 25 return isWinding;
26 } 26 }
27 27
28 GrTargetCommands::Cmd* GrInOrderCommandBuilder::recordDrawBatch(GrDrawBatch* bat ch, 28 GrTargetCommands::Cmd* GrInOrderCommandBuilder::recordDrawBatch(GrBatch* batch,
29 const GrCaps& ca ps) { 29 const GrCaps& ca ps) {
30 GrBATCH_INFO("In-Recording (%s, %u)\n", batch->name(), batch->uniqueID()); 30 GrBATCH_INFO("In-Recording (%s, %u)\n", batch->name(), batch->uniqueID());
31 if (!this->cmdBuffer()->empty() && 31 if (!this->cmdBuffer()->empty() &&
32 Cmd::kDrawBatch_CmdType == this->cmdBuffer()->back().type()) { 32 Cmd::kDrawBatch_CmdType == this->cmdBuffer()->back().type()) {
33 DrawBatch* previous = static_cast<DrawBatch*>(&this->cmdBuffer()->back() ); 33 DrawBatch* previous = static_cast<DrawBatch*>(&this->cmdBuffer()->back() );
34 if (previous->batch()->combineIfPossible(batch, caps)) { 34 if (previous->batch()->combineIfPossible(batch, caps)) {
35 GrBATCH_INFO("\tBatching with (%s, %u)\n", 35 GrBATCH_INFO("\tBatching with (%s, %u)\n",
36 previous->batch()->name(), previous->batch()->uniqueID( )); 36 previous->batch()->name(), previous->batch()->uniqueID( ));
37 return NULL; 37 return NULL;
38 } 38 }
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 DrawPaths* dp = GrNEW_APPEND_TO_RECORDER(*this->cmdBuffer(), DrawPaths, (sta te, pathRange)); 122 DrawPaths* dp = GrNEW_APPEND_TO_RECORDER(*this->cmdBuffer(), DrawPaths, (sta te, pathRange));
123 dp->fIndices = savedIndices; 123 dp->fIndices = savedIndices;
124 dp->fIndexType = indexType; 124 dp->fIndexType = indexType;
125 dp->fTransforms = savedTransforms; 125 dp->fTransforms = savedTransforms;
126 dp->fTransformType = transformType; 126 dp->fTransformType = transformType;
127 dp->fCount = count; 127 dp->fCount = count;
128 dp->fStencilSettings = stencilSettings; 128 dp->fStencilSettings = stencilSettings;
129 return dp; 129 return dp;
130 } 130 }
OLDNEW
« no previous file with comments | « src/gpu/GrInOrderCommandBuilder.h ('k') | src/gpu/GrReorderCommandBuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698