Remove translate param from GrContext::drawPath (and subsequent calls).
Review URL: https://codereview.appspot.com/6615062
git-svn-id: http://skia.googlecode.com/svn/trunk@5852 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index b3c0119..a193848 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -329,6 +329,11 @@
void setMatrix(const GrMatrix& m);
/**
+ * Sets the current transformation matrix to identity.
+ */
+ void setIdentityMatrix();
+
+ /**
* Concats the current matrix. The passed matrix is applied before the
* current matrix.
* @param m the matrix to concat.
@@ -414,8 +419,7 @@
* @param translate optional additional translation applied to the
* path.
*/
- void drawPath(const GrPaint& paint, const SkPath& path, GrPathFill fill,
- const GrPoint* translate = NULL);
+ void drawPath(const GrPaint& paint, const SkPath& path, GrPathFill fill);
/**
* Draws vertices with a paint.
@@ -845,8 +849,7 @@
/// draw state is left unmodified.
GrDrawTarget* prepareToDraw(const GrPaint*, BufferedDraw);
- void internalDrawPath(const GrPaint& paint, const SkPath& path,
- GrPathFill fill, const GrPoint* translate);
+ void internalDrawPath(const GrPaint& paint, const SkPath& path, GrPathFill fill);
GrTexture* createResizedTexture(const GrTextureDesc& desc,
const GrCacheData& cacheData,
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index 8169508..487878f 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -445,7 +445,6 @@
bool GrAAConvexPathRenderer::onDrawPath(const SkPath& origPath,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) {
@@ -458,9 +457,6 @@
GrDrawState* drawState = target->drawState();
GrMatrix vm = drawState->getViewMatrix();
- if (NULL != translate) {
- vm.postTranslate(translate->fX, translate->fY);
- }
if (!drawState->preConcatSamplerMatricesWithInverse(vm)) {
return false;
}
diff --git a/src/gpu/GrAAConvexPathRenderer.h b/src/gpu/GrAAConvexPathRenderer.h
index c87052e..7a2fd38 100644
--- a/src/gpu/GrAAConvexPathRenderer.h
+++ b/src/gpu/GrAAConvexPathRenderer.h
@@ -21,7 +21,6 @@
protected:
virtual bool onDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) SK_OVERRIDE;
};
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
index 819092d..5d30b24 100644
--- a/src/gpu/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/GrAAHairLinePathRenderer.cpp
@@ -197,7 +197,6 @@
*/
int generate_lines_and_quads(const SkPath& path,
const SkMatrix& m,
- const SkVector& translate,
const GrIRect& devClipBounds,
PtArray* lines,
PtArray* quads,
@@ -218,7 +217,6 @@
case kMove_PathCmd:
break;
case kLine_PathCmd:
- SkPoint::Offset(pts, 2, translate);
m.mapPoints(devPts, pts, 2);
bounds.setBounds(devPts, 2);
bounds.outset(SK_Scalar1, SK_Scalar1);
@@ -230,7 +228,6 @@
}
break;
case kQuadratic_PathCmd:
- SkPoint::Offset(pts, 3, translate);
m.mapPoints(devPts, pts, 3);
bounds.setBounds(devPts, 3);
bounds.outset(SK_Scalar1, SK_Scalar1);
@@ -257,7 +254,6 @@
}
break;
case kCubic_PathCmd:
- SkPoint::Offset(pts, 4, translate);
m.mapPoints(devPts, pts, 4);
bounds.setBounds(devPts, 4);
bounds.outset(SK_Scalar1, SK_Scalar1);
@@ -503,7 +499,6 @@
bool GrAAHairLinePathRenderer::createGeom(
const SkPath& path,
- const GrVec* translate,
GrDrawTarget* target,
int* lineCnt,
int* quadCnt,
@@ -521,11 +516,7 @@
PREALLOC_PTARRAY(128) lines;
PREALLOC_PTARRAY(128) quads;
IntArray qSubdivs;
- static const GrVec gZeroVec = {0, 0};
- if (NULL == translate) {
- translate = &gZeroVec;
- }
- *quadCnt = generate_lines_and_quads(path, viewM, *translate, devClipBounds,
+ *quadCnt = generate_lines_and_quads(path, viewM, devClipBounds,
&lines, &quads, &qSubdivs);
*lineCnt = lines.count() / 2;
@@ -582,7 +573,6 @@
bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) {
@@ -590,7 +580,6 @@
int quadCnt;
GrDrawTarget::AutoReleaseGeometry arg;
if (!this->createGeom(path,
- translate,
target,
&lineCnt,
&quadCnt,
diff --git a/src/gpu/GrAAHairLinePathRenderer.h b/src/gpu/GrAAHairLinePathRenderer.h
index c04d062..9129a89 100644
--- a/src/gpu/GrAAHairLinePathRenderer.h
+++ b/src/gpu/GrAAHairLinePathRenderer.h
@@ -25,7 +25,6 @@
protected:
virtual bool onDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) SK_OVERRIDE;
@@ -36,7 +35,6 @@
const GrIndexBuffer* fQuadsIndexBuffer);
bool createGeom(const SkPath& path,
- const GrVec* translate,
GrDrawTarget* target,
int* lineCnt,
int* quadCnt,
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index f40c265..5f1f0e3 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -441,7 +441,7 @@
return draw_path_in_software(context, gpu, path, fill, doAA, resultBounds);
}
- pr->drawPath(path, fill, NULL, gpu, doAA);
+ pr->drawPath(path, fill, gpu, doAA);
return true;
}
@@ -857,7 +857,7 @@
} else {
if (canRenderDirectToStencil) {
*drawState->stencil() = gDrawToStencil;
- pr->drawPath(*clipPath, fill, NULL, fGpu, false);
+ pr->drawPath(*clipPath, fill, fGpu, false);
} else {
pr->drawPathToStencil(*clipPath, fill, fGpu);
}
@@ -875,7 +875,7 @@
fGpu->drawSimpleRect(*clip->fRect, NULL);
} else {
SET_RANDOM_COLOR
- pr->drawPath(*clipPath, fill, NULL, fGpu, false);
+ pr->drawPath(*clipPath, fill, fGpu, false);
}
} else {
SET_RANDOM_COLOR
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 7e0c915..ef59ca5 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1019,7 +1019,7 @@
path.addOval(rect);
GrPathFill fill = (strokeWidth == 0) ?
kHairLine_GrPathFill : kWinding_GrPathFill;
- this->internalDrawPath(paint, path, fill, NULL);
+ this->internalDrawPath(paint, path, fill);
return;
}
@@ -1091,8 +1091,7 @@
target->drawNonIndexed(kTriangleStrip_GrPrimitiveType, 0, 4);
}
-void GrContext::drawPath(const GrPaint& paint, const SkPath& path,
- GrPathFill fill, const GrPoint* translate) {
+void GrContext::drawPath(const GrPaint& paint, const SkPath& path, GrPathFill fill) {
if (path.isEmpty()) {
if (GrIsFillInverted(fill)) {
@@ -1103,19 +1102,15 @@
SkRect ovalRect;
if (!GrIsFillInverted(fill) && path.isOval(&ovalRect)) {
- if (translate) {
- ovalRect.offset(*translate);
- }
SkScalar width = (fill == kHairLine_GrPathFill) ? 0 : -SK_Scalar1;
this->drawOval(paint, ovalRect, width);
return;
}
- internalDrawPath(paint, path, fill, translate);
+ this->internalDrawPath(paint, path, fill);
}
-void GrContext::internalDrawPath(const GrPaint& paint, const SkPath& path,
- GrPathFill fill, const GrPoint* translate) {
+void GrContext::internalDrawPath(const GrPaint& paint, const SkPath& path, GrPathFill fill) {
// Note that below we may sw-rasterize the path into a scratch texture.
// Scratch textures can be recycled after they are returned to the texture
@@ -1146,7 +1141,7 @@
return;
}
- pr->drawPath(path, fill, translate, target, prAA);
+ pr->drawPath(path, fill, target, prAA);
}
////////////////////////////////////////////////////////////////////////////////
@@ -1672,6 +1667,10 @@
fDrawState->setViewMatrix(m);
}
+void GrContext::setIdentityMatrix() {
+ fDrawState->viewMatrix()->reset();
+}
+
void GrContext::concatMatrix(const GrMatrix& m) const {
fDrawState->preConcatViewMatrix(m);
}
diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
index eb4072d..4f725af 100644
--- a/src/gpu/GrDefaultPathRenderer.cpp
+++ b/src/gpu/GrDefaultPathRenderer.cpp
@@ -183,7 +183,6 @@
bool GrDefaultPathRenderer::createGeom(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrScalar srcSpaceTol,
GrDrawTarget* target,
GrPrimitiveType* primType,
@@ -312,20 +311,12 @@
*vertexCnt = vert - base;
*indexCnt = idx - idxBase;
- if (NULL != translate &&
- (translate->fX || translate->fY)) {
- int count = vert - base;
- for (int i = 0; i < count; i++) {
- base[i].offset(translate->fX, translate->fY);
- }
- }
}
return true;
}
bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool stencilOnly) {
@@ -339,7 +330,6 @@
GrDrawTarget::AutoReleaseGeometry arg;
if (!this->createGeom(path,
fill,
- translate,
tol,
target,
&primType,
@@ -481,9 +471,6 @@
}
} else {
bounds = path.getBounds();
- if (NULL != translate) {
- bounds.offset(*translate);
- }
}
GrDrawTarget::AutoGeometryPush agp(target);
target->drawSimpleRect(bounds, NULL);
@@ -514,12 +501,10 @@
bool GrDefaultPathRenderer::onDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) {
return this->internalDrawPath(path,
fill,
- translate,
target,
false);
}
@@ -529,5 +514,5 @@
GrDrawTarget* target) {
GrAssert(kInverseEvenOdd_GrPathFill != fill);
GrAssert(kInverseWinding_GrPathFill != fill);
- this->internalDrawPath(path, fill, NULL, target, true);
+ this->internalDrawPath(path, fill, target, true);
}
diff --git a/src/gpu/GrDefaultPathRenderer.h b/src/gpu/GrDefaultPathRenderer.h
index f573133..e17f9cf 100644
--- a/src/gpu/GrDefaultPathRenderer.h
+++ b/src/gpu/GrDefaultPathRenderer.h
@@ -38,19 +38,16 @@
virtual bool onDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) SK_OVERRIDE;
bool internalDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool stencilOnly);
bool createGeom(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrScalar srcSpaceTol,
GrDrawTarget* target,
GrPrimitiveType* primType,
diff --git a/src/gpu/GrPathRenderer.h b/src/gpu/GrPathRenderer.h
index 5cbaab1..fc3d672 100644
--- a/src/gpu/GrPathRenderer.h
+++ b/src/gpu/GrPathRenderer.h
@@ -97,18 +97,15 @@
*
* @param path the path to draw.
* @param fill the path filling rule to use.
- * @param translate optional additional translation applied to
- * the path (can be NULL)
* @param target target that the path will be rendered to
* @param antiAlias true if anti-aliasing is required.
*/
virtual bool drawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) {
GrAssert(this->canDrawPath(path, fill, target, antiAlias));
- return this->onDrawPath(path, fill, translate, target, antiAlias);
+ return this->onDrawPath(path, fill, target, antiAlias);
}
/**
@@ -135,14 +132,11 @@
*
* @param path the path to draw.
* @param fill the path filling rule to use.
- * @param translate optional additional translation applied to
- * the path
* @param target target that the path will be rendered to
* @param antiAlias whether antialiasing is enabled or not.
*/
virtual bool onDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) = 0;
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index a2c5867..3dd9606 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -108,7 +108,6 @@
// return true on success; false on failure
bool GrSoftwarePathRenderer::onDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) {
@@ -119,9 +118,6 @@
GrDrawState* drawState = target->drawState();
GrMatrix vm = drawState->getViewMatrix();
- if (NULL != translate) {
- vm.postTranslate(translate->fX, translate->fY);
- }
GrIRect devPathBounds, devClipBounds;
if (!get_path_and_clip_bounds(target, path, vm,
diff --git a/src/gpu/GrSoftwarePathRenderer.h b/src/gpu/GrSoftwarePathRenderer.h
index 7884cbb..fdcc7bd 100644
--- a/src/gpu/GrSoftwarePathRenderer.h
+++ b/src/gpu/GrSoftwarePathRenderer.h
@@ -31,7 +31,6 @@
protected:
virtual bool onDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) SK_OVERRIDE;
diff --git a/src/gpu/GrStencilAndCoverPathRenderer.cpp b/src/gpu/GrStencilAndCoverPathRenderer.cpp
index 3042cec..5a6b9db 100644
--- a/src/gpu/GrStencilAndCoverPathRenderer.cpp
+++ b/src/gpu/GrStencilAndCoverPathRenderer.cpp
@@ -57,9 +57,8 @@
bool GrStencilAndCoverPathRenderer::onDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
- bool antiAlias){
+ bool antiAlias) {
GrAssert(!antiAlias);
GrAssert(kHairLine_GrPathFill != fill);
@@ -68,10 +67,7 @@
SkAutoTUnref<GrPath> p(fGpu->createPath(path));
GrDrawState::AutoViewMatrixRestore avmr;
- if (translate) {
- avmr.set(drawState);
- drawState->viewMatrix()->postTranslate(translate->fX, translate->fY);
- }
+
GrPathFill nonInvertedFill = GrNonInvertedFill(fill);
target->stencilPath(p, nonInvertedFill);
@@ -111,13 +107,11 @@
// theoretically could set bloat = 0, instead leave it because of matrix inversion
// precision.
} else {
+ avmr.set(drawState);
if (!drawState->preConcatSamplerMatricesWithInverse(drawState->getViewMatrix())) {
GrPrintf("Could not invert matrix.\n");
return false;
}
- if (avmr.isSet()) {
- avmr.set(drawState);
- }
drawState->viewMatrix()->reset();
bloat = 0;
}
diff --git a/src/gpu/GrStencilAndCoverPathRenderer.h b/src/gpu/GrStencilAndCoverPathRenderer.h
index fbeaaba..e44ddb2 100644
--- a/src/gpu/GrStencilAndCoverPathRenderer.h
+++ b/src/gpu/GrStencilAndCoverPathRenderer.h
@@ -41,7 +41,6 @@
protected:
virtual bool onDrawPath(const SkPath& path,
GrPathFill fill,
- const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) SK_OVERRIDE;
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index c245401..e97bc8f 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -221,11 +221,12 @@
glyph->fPath = path;
}
- GrPoint translate;
- translate.set(GrFixedToScalar(vx - GrIntToFixed(glyph->fBounds.fLeft)),
- GrFixedToScalar(vy - GrIntToFixed(glyph->fBounds.fTop)));
- fContext->drawPath(fPaint, *glyph->fPath, kWinding_GrPathFill,
- &translate);
+ GrContext::AutoMatrix am(fContext, GrContext::AutoMatrix::kPreserve_InitialMatrix);
+ GrMatrix translate;
+ translate.setTranslate(GrFixedToScalar(vx - GrIntToFixed(glyph->fBounds.fLeft)),
+ GrFixedToScalar(vy - GrIntToFixed(glyph->fBounds.fTop)));
+ fContext->concatMatrix(translate);
+ fContext->drawPath(fPaint, *glyph->fPath, kWinding_GrPathFill);
return;
}
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index b0b5ed0..8841676 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -878,7 +878,8 @@
SkAutoTUnref<GrTexture> blurTexture;
- GrContext::AutoMatrix avm(context, GrMatrix::I());
+ // We pass kPreserve here. We will replace the current matrix below.
+ GrContext::AutoMatrix avm(context, GrContext::AutoMatrix::kPreserve_InitialMatrix);
{
GrContext::AutoRenderTarget art(context, pathTexture->asRenderTarget());
@@ -897,8 +898,14 @@
// use a zero dst coeff when dual source blending isn't available.
tempPaint.setBlendFunc(kOne_GrBlendCoeff, kISC_GrBlendCoeff);
}
- // Draw hard shadow to pathTexture with path topleft at origin 0,0.
- context->drawPath(tempPaint, path, pathFillType, &offset);
+ // Draw hard shadow to pathTexture with path top-left at origin 0,0.
+ GrMatrix translate;
+ translate.setTranslate(offset.fX, offset.fY);
+ context->setMatrix(translate);
+ context->drawPath(tempPaint, path, pathFillType);
+
+ // switch to device coord drawing when going back to the main RT.
+ context->setIdentityMatrix();
// If we're doing a normal blur, we can clobber the pathTexture in the
// gaussianBlur. Otherwise, we need to save it for later compositing.
@@ -910,7 +917,7 @@
GrPaint paint;
paint.reset();
paint.colorSampler(0)->matrix()->setIDiv(pathTexture->width(),
- pathTexture->height());
+ pathTexture->height());
// Blend pathTexture over blurTexture.
context->setRenderTarget(blurTexture->asRenderTarget());
paint.colorSampler(0)->setCustomStage(SkNEW_ARGS