From 3f0e6945f89036068fc3cb36f4ac9e9e0631d245 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Wed, 10 Aug 2016 08:40:35 -0700 Subject: Revert of Create blurred RRect mask on GPU (rather than uploading it) (patchset #5 id:80001 of https://codereview.chromium.org/2222083004/ ) Reason for revert: No NoGPU bot on commit queue ? Original issue's description: > Create blurred RRect mask on GPU (rather than uploading it) > > This CL doesn't try to resolve any of the larger issues. It just moves the computation of the blurred RRect to the gpu and sets up to start using vertex attributes for a nine patch draw (i.e., returning the texture coordinates) > > All blurred rrects using the "analytic" path will change slightly with this CL. > > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2222083004 > > Committed: https://skia.googlesource.com/skia/+/75ccdc77a70ec2083141bf9ba98eb2f01ece2479 > Committed: https://skia.googlesource.com/skia/+/94b5c5a41160e0f55e267fc3d830df65736fac50 TBR=bsalomon@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.chromium.org/2232953002 --- tests/BlurTest.cpp | 62 ------------------------------------------------------ 1 file changed, 62 deletions(-) (limited to 'tests/BlurTest.cpp') diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp index 32e2930171..6ccb0471aa 100644 --- a/tests/BlurTest.cpp +++ b/tests/BlurTest.cpp @@ -574,66 +574,4 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SmallBoxBlurBug, reporter, ctxInfo) { #endif - -DEF_TEST(BlurredRRectNinePatchComputation, reporter) { - const SkRect r = SkRect::MakeXYWH(10, 10, 100, 100); - - bool ninePatchable; - SkRRect rrectToDraw; - SkISize size; - SkScalar xs[4], ys[4]; - int numXs, numYs; - - // not nine-patchable - { - SkVector radii[4] = { { 100, 100 }, { 0, 0 }, { 100, 100 }, { 0, 0 } }; - - SkRRect rr; - rr.setRectRadii(r, radii); - - ninePatchable = SkBlurMaskFilter::ComputeBlurredRRectParams(rr, 3.0f, &rrectToDraw, &size, - xs, &numXs, ys, &numYs); - REPORTER_ASSERT(reporter, !ninePatchable); - } - - // simple circular - { - SkRRect rr; - rr.setRectXY(r, 10, 10); - - ninePatchable = SkBlurMaskFilter::ComputeBlurredRRectParams(rr, 3.0f, &rrectToDraw, &size, - xs, &numXs, ys, &numYs); - REPORTER_ASSERT(reporter, ninePatchable); - REPORTER_ASSERT(reporter, SkScalarNearlyEqual(SkIntToScalar(size.fWidth), 57.0f)); - REPORTER_ASSERT(reporter, SkScalarNearlyEqual(SkIntToScalar(size.fHeight), 57.0)); - REPORTER_ASSERT(reporter, 4 == numXs && 4 == numYs); - for (int i = 0; i < numXs; ++i) { - REPORTER_ASSERT(reporter, xs[i] >= 0.0f && xs[i] <= 1.0f); - } - for (int i = 0; i < numYs; ++i) { - REPORTER_ASSERT(reporter, ys[i] >= 0.0f && ys[i] <= 1.0f); - } - } - - // simple elliptical - { - SkRRect rr; - rr.setRectXY(r, 2, 10); - - ninePatchable = SkBlurMaskFilter::ComputeBlurredRRectParams(rr, 3.0f, &rrectToDraw, &size, - xs, &numXs, ys, &numYs); - REPORTER_ASSERT(reporter, ninePatchable); - REPORTER_ASSERT(reporter, SkScalarNearlyEqual(SkIntToScalar(size.fWidth), 41.0f)); - REPORTER_ASSERT(reporter, SkScalarNearlyEqual(SkIntToScalar(size.fHeight), 57.0)); - REPORTER_ASSERT(reporter, 4 == numXs && 4 == numYs); - for (int i = 0; i < numXs; ++i) { - REPORTER_ASSERT(reporter, xs[i] >= 0.0f && xs[i] <= 1.0f); - } - for (int i = 0; i < numYs; ++i) { - REPORTER_ASSERT(reporter, ys[i] >= 0.0f && ys[i] <= 1.0f); - } - } - -} - /////////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3