inject a 32767 bounded cliprect before using SuperSampler blitter, to avoid
crash/assert when our run-array is larger than int16_t. Better fix may be to
"tile" the drawing, so we never see a clip that's too wide, and perhaps this
technique can help us avoid disabling AA for large parths (not sure tho).
git-svn-id: http://skia.googlecode.com/svn/trunk@3104 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkScan_AntiPath.cpp b/src/core/SkScan_AntiPath.cpp
index 97843ef..77171b3 100644
--- a/src/core/SkScan_AntiPath.cpp
+++ b/src/core/SkScan_AntiPath.cpp
@@ -561,9 +561,9 @@
return (value << s >> s) - value;
}
-void SkScan::AntiFillPath(const SkPath& path, const SkRegion& clip,
+void SkScan::AntiFillPath(const SkPath& path, const SkRegion& origClip,
SkBlitter* blitter, bool forceRLE) {
- if (clip.isEmpty()) {
+ if (origClip.isEmpty()) {
return;
}
@@ -571,7 +571,7 @@
path.getBounds().roundOut(&ir);
if (ir.isEmpty()) {
if (path.isInverseFillType()) {
- blitter->blitRegion(clip);
+ blitter->blitRegion(origClip);
}
return;
}
@@ -583,16 +583,35 @@
overflows_short_shift(ir.fTop, SHIFT) |
overflows_short_shift(ir.fBottom, SHIFT)) {
// can't supersample, so draw w/o antialiasing
- SkScan::FillPath(path, clip, blitter);
+ SkScan::FillPath(path, origClip, blitter);
return;
}
- SkScanClipper clipper(blitter, &clip, ir);
+ // Our antialiasing can't handle a clip larger than 32767, so we restrict
+ // the clip to that limit here. (the runs[] uses int16_t for its index).
+ //
+ // A more general solution (one that could also eliminate the need to disable
+ // aa based on ir bounds (see overflows_short_shift) would be to tile the
+ // clip/target...
+ SkRegion tmpClipStorage;
+ const SkRegion* clipRgn = &origClip;
+ {
+ static const int32_t kMaxClipCoord = 32767;
+ const SkIRect& bounds = origClip.getBounds();
+ if (bounds.fRight > kMaxClipCoord || bounds.fBottom > kMaxClipCoord) {
+ SkIRect limit = { 0, 0, kMaxClipCoord, kMaxClipCoord };
+ tmpClipStorage.op(origClip, limit, SkRegion::kIntersect_Op);
+ clipRgn = &tmpClipStorage;
+ }
+ }
+ // for here down, use clipRgn, not origClip
+
+ SkScanClipper clipper(blitter, clipRgn, ir);
const SkIRect* clipRect = clipper.getClipRect();
if (clipper.getBlitter() == NULL) { // clipped out
if (path.isInverseFillType()) {
- blitter->blitRegion(clip);
+ blitter->blitRegion(*clipRgn);
}
return;
}
@@ -601,7 +620,7 @@
blitter = clipper.getBlitter();
if (path.isInverseFillType()) {
- sk_blit_above(blitter, ir, clip);
+ sk_blit_above(blitter, ir, *clipRgn);
}
SkIRect superRect, *superClipRect = NULL;
@@ -617,16 +636,16 @@
// MaskSuperBlitter can't handle drawing outside of ir, so we can't use it
// if we're an inverse filltype
if (!path.isInverseFillType() && MaskSuperBlitter::CanHandleRect(ir) && !forceRLE) {
- MaskSuperBlitter superBlit(blitter, ir, clip);
+ MaskSuperBlitter superBlit(blitter, ir, *clipRgn);
SkASSERT(SkIntToScalar(ir.fTop) <= path.getBounds().fTop);
- sk_fill_path(path, superClipRect, &superBlit, ir.fTop, ir.fBottom, SHIFT, clip);
+ sk_fill_path(path, superClipRect, &superBlit, ir.fTop, ir.fBottom, SHIFT, *clipRgn);
} else {
- SuperBlitter superBlit(blitter, ir, clip);
- sk_fill_path(path, superClipRect, &superBlit, ir.fTop, ir.fBottom, SHIFT, clip);
+ SuperBlitter superBlit(blitter, ir, *clipRgn);
+ sk_fill_path(path, superClipRect, &superBlit, ir.fTop, ir.fBottom, SHIFT, *clipRgn);
}
if (path.isInverseFillType()) {
- sk_blit_below(blitter, ir, clip);
+ sk_blit_below(blitter, ir, *clipRgn);
}
}