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

Unified Diff: src/gpu/batches/GrDefaultPathRenderer.cpp

Issue 2167193002: Revert of Remove DrawFace enum from GrPipelineBuilder (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/batches/GrDashLinePathRenderer.cpp ('k') | src/gpu/batches/GrStencilAndCoverPathRenderer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/batches/GrDefaultPathRenderer.cpp
diff --git a/src/gpu/batches/GrDefaultPathRenderer.cpp b/src/gpu/batches/GrDefaultPathRenderer.cpp
index 939c025dccb20b1b5742080de60eb9c4b6f5ce5e..dc40b7c611aeea7f37ba90c4fc292b248e5ab28b 100644
--- a/src/gpu/batches/GrDefaultPathRenderer.cpp
+++ b/src/gpu/batches/GrDefaultPathRenderer.cpp
@@ -433,7 +433,7 @@
int passCount = 0;
const GrUserStencilSettings* passes[3];
- GrDrawFace drawFace[3];
+ GrPipelineBuilder::DrawFace drawFace[3];
bool reverse = false;
bool lastPassIsBounds;
@@ -445,7 +445,7 @@
passes[0] = userStencilSettings;
}
lastPassIsBounds = false;
- drawFace[0] = GrDrawFace::kBoth;
+ drawFace[0] = GrPipelineBuilder::kBoth_DrawFace;
} else {
if (single_pass_shape(shape)) {
passCount = 1;
@@ -454,7 +454,7 @@
} else {
passes[0] = userStencilSettings;
}
- drawFace[0] = GrDrawFace::kBoth;
+ drawFace[0] = GrPipelineBuilder::kBoth_DrawFace;
lastPassIsBounds = false;
} else {
switch (path.getFillType()) {
@@ -475,7 +475,7 @@
passes[1] = &gEOColorPass;
}
}
- drawFace[0] = drawFace[1] = GrDrawFace::kBoth;
+ drawFace[0] = drawFace[1] = GrPipelineBuilder::kBoth_DrawFace;
break;
case SkPath::kInverseWinding_FillType:
@@ -489,7 +489,7 @@
passes[0] = &gWindStencilSeparateNoWrap;
}
passCount = 2;
- drawFace[0] = GrDrawFace::kBoth;
+ drawFace[0] = GrPipelineBuilder::kBoth_DrawFace;
} else {
if (fStencilWrapOps) {
passes[0] = &gWindSingleStencilWithWrapInc;
@@ -499,8 +499,8 @@
passes[1] = &gWindSingleStencilNoWrapDec;
}
// which is cw and which is ccw is arbitrary.
- drawFace[0] = GrDrawFace::kCW;
- drawFace[1] = GrDrawFace::kCCW;
+ drawFace[0] = GrPipelineBuilder::kCW_DrawFace;
+ drawFace[1] = GrPipelineBuilder::kCCW_DrawFace;
passCount = 3;
}
if (stencilOnly) {
@@ -508,7 +508,7 @@
--passCount;
} else {
lastPassIsBounds = true;
- drawFace[passCount-1] = GrDrawFace::kBoth;
+ drawFace[passCount-1] = GrPipelineBuilder::kBoth_DrawFace;
if (reverse) {
passes[passCount-1] = &gInvWindColorPass;
} else {
@@ -554,7 +554,7 @@
GrRectBatchFactory::CreateNonAAFill(paint.getColor(), viewM, bounds, nullptr,
&localMatrix));
- SkASSERT(GrDrawFace::kBoth == drawFace[p]);
+ SkASSERT(GrPipelineBuilder::kBoth_DrawFace == drawFace[p]);
GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(paint));
pipelineBuilder.setDrawFace(drawFace[p]);
pipelineBuilder.setUserStencil(passes[p]);
« no previous file with comments | « src/gpu/batches/GrDashLinePathRenderer.cpp ('k') | src/gpu/batches/GrStencilAndCoverPathRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698