Fixing blurred shadows of hairline paths when rendered on the GPU
BUG=http://code.google.com/p/chromium/issues/detail?id=121251
REVIEW=http://codereview.appspot.com/5972064/
git-svn-id: http://skia.googlecode.com/svn/trunk@3607 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 750a4aa..437efbd 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -750,7 +750,7 @@
bool drawWithGPUMaskFilter(GrContext* context, const SkPath& path,
SkMaskFilter* filter, const SkMatrix& matrix,
const SkRegion& clip, SkBounder* bounder,
- GrPaint* grp) {
+ GrPaint* grp, GrPathFill pathFillType) {
#ifdef SK_DISABLE_GPU_BLUR
return false;
#endif
@@ -830,7 +830,7 @@
tempPaint.fDstBlendCoeff = kISC_BlendCoeff;
}
// Draw hard shadow to pathTexture with path topleft at origin 0,0.
- context->drawPath(tempPaint, path, skToGrFillType(path.getFillType()), &offset);
+ context->drawPath(tempPaint, path, pathFillType, &offset);
GrAutoScratchTexture temp1, temp2;
// If we're doing a normal blur, we can clobber the pathTexture in the
@@ -895,12 +895,12 @@
bool drawWithMaskFilter(GrContext* context, const SkPath& path,
SkMaskFilter* filter, const SkMatrix& matrix,
const SkRegion& clip, SkBounder* bounder,
- GrPaint* grp) {
+ GrPaint* grp, SkPaint::Style style) {
SkMask srcM, dstM;
if (!SkDraw::DrawToMask(path, &clip.getBounds(), filter, &matrix, &srcM,
SkMask::kComputeBoundsAndRenderImage_CreateMode,
- SkPaint::kFill_Style)) {
+ style)) {
return false;
}
SkAutoMaskFreeImage autoSrc(srcM.fImage);
@@ -1034,12 +1034,16 @@
// transform the path into device space
pathPtr->transform(*draw.fMatrix, devPathPtr);
+ GrPathFill pathFillType = doFill ?
+ skToGrFillType(devPathPtr->getFillType()) : kHairLine_PathFill;
if (!drawWithGPUMaskFilter(fContext, *devPathPtr, paint.getMaskFilter(),
*draw.fMatrix, *draw.fClip, draw.fBounder,
- &grPaint)) {
+ &grPaint, pathFillType)) {
+ SkPaint::Style style = doFill ? SkPaint::kFill_Style :
+ SkPaint::kStroke_Style;
drawWithMaskFilter(fContext, *devPathPtr, paint.getMaskFilter(),
*draw.fMatrix, *draw.fClip, draw.fBounder,
- &grPaint);
+ &grPaint, style);
}
return;
}