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

Fall back on stencil clip when SW mask fails to allocate

Browse Source 
When generating a SW clip mask, we didn't used to verify that the
pixels had been successfully allocated. This would obviously crash
when the allocation was not successful. This change checks the
allocation first, and falls back on a stencil clip when it doesn't
succeed.

BUG=656589
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2456153003

Review-Url: https://codereview.chromium.org/2456153003
This commit is contained in:
csmartdalton 2016-10-28 12:01:10 -07:00 committed by Commit bot
parent c7635fa374
commit 3affdc1bcd
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gpu/GrClipStackClip.cpp
View File

@ -298,7 +298,13 @@ bool GrClipStackClip::apply(GrContext* context, GrRenderTargetContext* renderTar
return InitialState::kAllIn == reducedClip.initialState(); return InitialState::kAllIn == reducedClip.initialState();
} }
#ifdef SK_DEBUG
SkASSERT(reducedClip.hasIBounds()); SkASSERT(reducedClip.hasIBounds());
SkIRect rtIBounds = SkIRect::MakeWH(renderTargetContext->width(),
renderTargetContext->height());
SkIRect clipIBounds = reducedClip.ibounds().makeOffset(-fOrigin.x(), -fOrigin.y());
SkASSERT(rtIBounds.contains(clipIBounds)); // Mask shouldn't be larger than the RT.
#endif
// An element count of 4 was chosen because of the common pattern in Blink of: // An element count of 4 was chosen because of the common pattern in Blink of:
// isect RR // isect RR
@ -380,8 +386,10 @@ static void GetClipMaskKey(int32_t clipGenID, const SkIRect& bounds, GrUniqueKey
static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain(); static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
GrUniqueKey::Builder builder(key, kDomain, 3); GrUniqueKey::Builder builder(key, kDomain, 3);
builder[0] = clipGenID; builder[0] = clipGenID;
builder[1] = SkToU16(bounds.fLeft) | (SkToU16(bounds.fRight) << 16); // SkToS16 because image filters outset layers to a size indicated by the filter, which can
builder[2] = SkToU16(bounds.fTop) | (SkToU16(bounds.fBottom) << 16); // sometimes result in negative coordinates from clip space.
builder[1] = SkToS16(bounds.fLeft) | (SkToS16(bounds.fRight) << 16);
builder[2] = SkToS16(bounds.fTop) | (SkToS16(bounds.fBottom) << 16);
} }
sk_sp<GrTexture> GrClipStackClip::CreateAlphaClipMask(GrContext* context, sk_sp<GrTexture> GrClipStackClip::CreateAlphaClipMask(GrContext* context,
@ -432,7 +440,9 @@ sk_sp<GrTexture> GrClipStackClip::CreateSoftwareClipMask(GrTextureProvider* texP
SkMatrix translate; SkMatrix translate;
translate.setTranslate(SkIntToScalar(-reducedClip.left()), SkIntToScalar(-reducedClip.top())); translate.setTranslate(SkIntToScalar(-reducedClip.left()), SkIntToScalar(-reducedClip.top()));
helper.init(maskSpaceIBounds, &translate); if (!helper.init(maskSpaceIBounds, &translate)) {
return nullptr;
}
helper.clear(InitialState::kAllIn == reducedClip.initialState() ? 0xFF : 0x00); helper.clear(InitialState::kAllIn == reducedClip.initialState() ? 0xFF : 0x00);
for (ElementList::Iter iter(reducedClip.elements()); iter.get(); iter.next()) { for (ElementList::Iter iter(reducedClip.elements()); iter.get(); iter.next()) {