From e25eea4b36a488448fb730f4e3dc5a900b0e2892 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Tue, 29 Sep 2015 06:38:55 -0700 Subject: Use child processors to implement compose color filter. Review URL: https://codereview.chromium.org/1368423003 --- tests/GpuColorFilterTest.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/GpuColorFilterTest.cpp b/tests/GpuColorFilterTest.cpp index a99e91b824..543aefe517 100644 --- a/tests/GpuColorFilterTest.cpp +++ b/tests/GpuColorFilterTest.cpp @@ -100,19 +100,18 @@ static void test_getConstantColorComponents(skiatest::Reporter* reporter, GrCont GrPaint paint; for (size_t i = 0; i < SK_ARRAY_COUNT(filterTests); ++i) { const GetConstantComponentTestCase& test = filterTests[i]; - SkAutoTUnref cf(SkColorFilter::CreateModeFilter(test.filterColor, test.filterMode)); - SkTDArray array; - bool hasFrag = cf->asFragmentProcessors(grContext, paint.getProcessorDataManager(), &array); - REPORTER_ASSERT(reporter, hasFrag); - REPORTER_ASSERT(reporter, 1 == array.count()); + SkAutoTUnref cf( + SkColorFilter::CreateModeFilter(test.filterColor, test.filterMode)); + SkAutoTUnref fp( + cf->asFragmentProcessor(grContext, paint.getProcessorDataManager())); + REPORTER_ASSERT(reporter, fp); GrInvariantOutput inout(test.inputColor, static_cast(test.inputComponents), false); - array[0]->computeInvariantOutput(&inout); - - REPORTER_ASSERT(reporter, filterColor(inout.color(), inout.validFlags()) == test.outputColor); + fp->computeInvariantOutput(&inout); + REPORTER_ASSERT(reporter, filterColor(inout.color(), inout.validFlags()) == + test.outputColor); REPORTER_ASSERT(reporter, test.outputComponents == inout.validFlags()); - array[0]->unref(); } } -- cgit v1.2.3