| Index: tests/GrPorterDuffTest.cpp
|
| diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
|
| index d984f92142d3dddec9e1475e12b99e509e1ff9dd..d4179a6a742814145a00f2f88c62c869fa49dc4d 100644
|
| --- a/tests/GrPorterDuffTest.cpp
|
| +++ b/tests/GrPorterDuffTest.cpp
|
| @@ -1100,13 +1100,12 @@ static void test_lcd_coverage_fallback_case(skiatest::Reporter* reporter, const
|
| TestLCDCoverageBatch() : INHERITED(ClassID()) {}
|
|
|
| private:
|
| - void getInvariantOutputColor(GrInitInvariantOutput* out) const override {
|
| - out->setKnownFourComponents(GrColorPackRGBA(123, 45, 67, 221));
|
| - }
|
| -
|
| - void getInvariantOutputCoverage(GrInitInvariantOutput* out) const override {
|
| - out->setUnknownFourComponents();
|
| - out->setUsingLCDCoverage();
|
| + void computeBatchToXPOverrides(GrInitInvariantOutput* color, GrInitInvariantOutput* coverage,
|
| + bool* usePLSDstRead) const {
|
| + color->setKnownFourComponents(GrColorPackRGBA(123, 45, 67, 221));
|
| + coverage->setUnknownFourComponents();
|
| + coverage->setUsingLCDCoverage();
|
| + *usePLSDstRead = false;
|
| }
|
|
|
| const char* name() const override { return "Test LCD Text Batch"; }
|
| @@ -1117,9 +1116,10 @@ static void test_lcd_coverage_fallback_case(skiatest::Reporter* reporter, const
|
| typedef GrVertexBatch INHERITED;
|
| } testLCDCoverageBatch;
|
|
|
| - GrProcOptInfo colorPOI, covPOI;
|
| - colorPOI.calcColorWithBatch(&testLCDCoverageBatch, nullptr, 0);
|
| - covPOI.calcCoverageWithBatch(&testLCDCoverageBatch, nullptr, 0);
|
| + GrBatchToXPOverrides overrides;
|
| + testLCDCoverageBatch.getBatchToXPOverrides(overrides);
|
| + GrProcOptInfo colorPOI = overrides.fColorPOI;
|
| + GrProcOptInfo covPOI = overrides.fCoveragePOI;
|
|
|
| SkASSERT(kRGBA_GrColorComponentFlags == colorPOI.validFlags());
|
| SkASSERT(covPOI.isFourChannelOutput());
|
|
|