AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix GPU-only snapping bug in mask blur rendering

Browse Source 
The existing mask effect code in Ganesh is subject to snapping issues (when the created mask is redrawn). This artifact can be seen by rendering the original geometry (w/o blurs) and comparing that result to a rendering of the unblurred masks. W/o this patch the results do not match up (they are arbitrarily shifted by a pixel).

This patch will require rebaselining and suppressions.

Chromium layout tests suppressions are here:
https://codereview.chromium.org/1342683003/ (Add layout test suppressions for upcoming Skia roll)

Review URL: https://codereview.chromium.org/1338183002
This commit is contained in:
robertphillips 2015-09-14 11:18:13 -07:00 committed by Commit bot
parent efd50daa28
commit 3833daaa66
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gpu/GrBlurUtils.cpp
View File

@ -97,15 +97,20 @@ static bool draw_with_mask_filter(GrDrawContext* drawContext,
// Create a mask of 'devPath' and place the result in 'mask'. // Create a mask of 'devPath' and place the result in 'mask'.
static GrTexture* create_mask_GPU(GrContext* context, static GrTexture* create_mask_GPU(GrContext* context,
const SkRect& maskRect, SkRect* maskRect,
const SkPath& devPath, const SkPath& devPath,
const GrStrokeInfo& strokeInfo, const GrStrokeInfo& strokeInfo,
bool doAA, bool doAA,
int sampleCnt) { int sampleCnt) {
// This mask will ultimately be drawn as a non-AA rect (see draw_mask).
// Non-AA rects have a bad habit of snapping arbitrarily. Integerize here
// so the mask draws in a reproducible manner.
*maskRect = SkRect::Make(maskRect->roundOut());
GrSurfaceDesc desc; GrSurfaceDesc desc;
desc.fFlags = kRenderTarget_GrSurfaceFlag; desc.fFlags = kRenderTarget_GrSurfaceFlag;
desc.fWidth = SkScalarCeilToInt(maskRect.width()); desc.fWidth = SkScalarCeilToInt(maskRect->width());
desc.fHeight = SkScalarCeilToInt(maskRect.height()); desc.fHeight = SkScalarCeilToInt(maskRect->height());
desc.fSampleCnt = doAA ? sampleCnt : 0; desc.fSampleCnt = doAA ? sampleCnt : 0;
// We actually only need A8, but it often isn't supported as a // We actually only need A8, but it often isn't supported as a
// render target so default to RGBA_8888 // render target so default to RGBA_8888
@ -120,7 +125,7 @@ static GrTexture* create_mask_GPU(GrContext* context,
return nullptr; return nullptr;
} }
SkRect clipRect = SkRect::MakeWH(maskRect.width(), maskRect.height()); SkRect clipRect = SkRect::MakeWH(maskRect->width(), maskRect->height());
SkAutoTUnref<GrDrawContext> drawContext(context->drawContext()); SkAutoTUnref<GrDrawContext> drawContext(context->drawContext());
if (!drawContext) { if (!drawContext) {
@ -136,9 +141,10 @@ static GrTexture* create_mask_GPU(GrContext* context,
// setup new clip // setup new clip
GrClip clip(clipRect); GrClip clip(clipRect);
// Draw the mask into maskTexture with the path's top-left at the origin using tempPaint. // Draw the mask into maskTexture with the path's integerized top-left at
// the origin using tempPaint.
SkMatrix translate; SkMatrix translate;
translate.setTranslate(-maskRect.fLeft, -maskRect.fTop); translate.setTranslate(-maskRect->fLeft, -maskRect->fTop);
drawContext->drawPath(mask->asRenderTarget(), clip, tempPaint, translate, devPath, strokeInfo); drawContext->drawPath(mask->asRenderTarget(), clip, tempPaint, translate, devPath, strokeInfo);
return mask; return mask;
} }
@ -254,7 +260,7 @@ void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
} }
SkAutoTUnref<GrTexture> mask(create_mask_GPU(context, SkAutoTUnref<GrTexture> mask(create_mask_GPU(context,
maskRect, &maskRect,
*devPathPtr, *devPathPtr,
strokeInfo, strokeInfo,
grPaint.isAntiAlias(), grPaint.isAntiAlias(),