Revert "Don't require AA in order to use shader-based clips"

This reverts commit 2596567793.

TBR=robertphillips@google.com

Review URL: https://codereview.chromium.org/981723009
This commit is contained in:
bsalomon 2015-03-05 17:43:09 -08:00 committed by Commit bot
parent 5c518a8622
commit 55f0b18ee0

View File

@ -292,7 +292,8 @@ bool GrClipMaskManager::setupClipping(GrPipelineBuilder* pipelineBuilder,
SkVector clipToRTOffset = { SkIntToScalar(-clip.origin().fX), SkVector clipToRTOffset = { SkIntToScalar(-clip.origin().fX),
SkIntToScalar(-clip.origin().fY) }; SkIntToScalar(-clip.origin().fY) };
if (elements.isEmpty() || if (elements.isEmpty() ||
this->installClipEffects(pipelineBuilder, arfp, elements, clipToRTOffset, devBounds)) { (requiresAA && this->installClipEffects(pipelineBuilder, arfp, elements, clipToRTOffset,
devBounds))) {
SkIRect scissorSpaceIBounds(clipSpaceIBounds); SkIRect scissorSpaceIBounds(clipSpaceIBounds);
scissorSpaceIBounds.offset(-clip.origin()); scissorSpaceIBounds.offset(-clip.origin());
if (NULL == devBounds || if (NULL == devBounds ||