From f92bb3785fa8015cde9f379be52dedfce5abc290 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 23 Apr 2018 13:39:18 +0000 Subject: Revert "Prevent masked solid-color draws from being turned into clears" This reverts commit e9f2bbe082e9e1eb9d76e3043adedc9443427d8d. Reason for revert: ANGLE Original change's description: > Prevent masked solid-color draws from being turned into clears > > GrRenderTargetContext::drawRect was eliding a BlurMask filtered circle. > > Bug: skia:7765 > Change-Id: Id98c059f7d786ee5c9bca839c8e099997ff2aedb > Reviewed-on: https://skia-review.googlesource.com/122793 > Reviewed-by: Brian Salomon TBR=bsalomon@google.com,robertphillips@google.com Change-Id: I1b7752eab0fcf55ab6248eed587fd85d438efd78 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7765 Reviewed-on: https://skia-review.googlesource.com/122960 Reviewed-by: Robert Phillips Commit-Queue: Robert Phillips --- tests/BlurTest.cpp | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'tests/BlurTest.cpp') diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp index 07cfdcd2b1..e0ce22e3d6 100644 --- a/tests/BlurTest.cpp +++ b/tests/BlurTest.cpp @@ -708,39 +708,3 @@ DEF_TEST(BlurZeroSigma, reporter) { } } - -/////////////////////////////////////////////////////////////////////////////////////////// -#if SK_SUPPORT_GPU - -DEF_GPUTEST_FOR_RENDERING_CONTEXTS(BlurMaskBiggerThanDest, reporter, ctxInfo) { - GrContext* context = ctxInfo.grContext(); - - SkImageInfo ii = SkImageInfo::Make(32, 32, kRGBA_8888_SkColorType, kPremul_SkAlphaType); - - sk_sp dst(SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, ii)); - if (!dst) { - ERRORF(reporter, "Could not create surface for test."); - return; - } - - SkPaint p; - p.setColor(SK_ColorRED); - p.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, 3)); - - SkCanvas* canvas = dst->getCanvas(); - - canvas->clear(SK_ColorBLACK); - canvas->drawCircle(SkPoint::Make(16, 16), 8, p); - - SkBitmap readback; - SkAssertResult(readback.tryAllocPixels(ii)); - - canvas->readPixels(readback, 0, 0); - REPORTER_ASSERT(reporter, SkColorGetR(readback.getColor(15, 15)) > 128); - REPORTER_ASSERT(reporter, SkColorGetG(readback.getColor(15, 15)) == 0); - REPORTER_ASSERT(reporter, SkColorGetB(readback.getColor(15, 15)) == 0); - REPORTER_ASSERT(reporter, readback.getColor(31, 31) == SK_ColorBLACK); -} - -#endif - -- cgit v1.2.3