Remove stage masks
Review URL: http://codereview.appspot.com/6422047/
git-svn-id: http://skia.googlecode.com/svn/trunk@4688 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index 17363db..a59a7be 100644
--- a/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
@@ -186,7 +186,6 @@
const GrVec* translate,
GrScalar srcSpaceTol,
GrDrawTarget* target,
- GrDrawState::StageMask stageMask,
GrPrimitiveType* primType,
int* vertexCnt,
int* indexCnt,
@@ -328,7 +327,6 @@
GrPathFill fill,
const GrVec* translate,
GrDrawTarget* target,
- GrDrawState::StageMask stageMask,
bool stencilOnly) {
GrMatrix viewM = target->getDrawState().getViewMatrix();
@@ -344,7 +342,6 @@
translate,
tol,
target,
- stageMask,
&primType,
&vertexCnt,
&indexCnt,
@@ -475,12 +472,10 @@
drawState->getViewInverse(&vmi)) {
vmi.mapRect(&bounds);
} else {
- if (stageMask) {
- if (!drawState->getViewInverse(&vmi)) {
- GrPrintf("Could not invert matrix.");
- return false;
- }
- drawState->preConcatSamplerMatrices(stageMask, vmi);
+ const GrMatrix& vm = drawState->getViewMatrix();
+ if (!drawState->preConcatSamplerMatricesWithInverse(vm)) {
+ GrPrintf("Could not invert matrix.\n");
+ return false;
}
drawState->viewMatrix()->reset();
}
@@ -491,7 +486,7 @@
}
}
GrDrawTarget::AutoGeometryPush agp(target);
- target->drawSimpleRect(bounds, NULL, stageMask);
+ target->drawSimpleRect(bounds, NULL);
} else {
if (passCount > 1) {
drawState->enableState(GrDrawState::kNoColorWrites_StateBit);
@@ -521,13 +516,11 @@
GrPathFill fill,
const GrVec* translate,
GrDrawTarget* target,
- GrDrawState::StageMask stageMask,
bool antiAlias) {
return this->internalDrawPath(path,
fill,
translate,
target,
- stageMask,
false);
}
@@ -536,5 +529,5 @@
GrDrawTarget* target) {
GrAssert(kInverseEvenOdd_GrPathFill != fill);
GrAssert(kInverseWinding_GrPathFill != fill);
- this->internalDrawPath(path, fill, NULL, target, 0, true);
+ this->internalDrawPath(path, fill, NULL, target, true);
}