Index: tests/GrPorterDuffTest.cpp |
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp |
index 5755c8154564f93ce16d898a6f7bfb3be8e83168..077f27ca3e791d07fae99e5d98358e7bf9bc8af6 100644 |
--- a/tests/GrPorterDuffTest.cpp |
+++ b/tests/GrPorterDuffTest.cpp |
@@ -98,6 +98,7 @@ static void test_lcd_coverage(skiatest::Reporter* reporter, const GrCaps& caps) |
opt.fColorPOI.calcWithInitialValues(NULL, 0, 0, kNone_GrColorComponentFlags, false); |
// Setting 2nd to last value to false and last to true will force covPOI to LCD coverage. |
opt.fCoveragePOI.calcWithInitialValues(NULL, 0, 0, kNone_GrColorComponentFlags, false, true); |
+ opt.fOverrides.fUsePLSDstRead = false; |
SkASSERT(!opt.fColorPOI.isOpaque()); |
SkASSERT(!opt.fColorPOI.isSolidWhite()); |
@@ -290,6 +291,7 @@ static void test_color_unknown_with_coverage(skiatest::Reporter* reporter, const |
false); |
optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, 0, kNone_GrColorComponentFlags, |
true); |
+ optimizations.fOverrides.fUsePLSDstRead = false; |
SkASSERT(!optimizations.fColorPOI.isOpaque()); |
SkASSERT(!optimizations.fColorPOI.isSolidWhite()); |
@@ -484,6 +486,7 @@ static void test_color_unknown_no_coverage(skiatest::Reporter* reporter, const G |
kR_GrColorComponentFlag | kB_GrColorComponentFlag, false); |
optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, GrColorPackA4(255), |
kRGBA_GrColorComponentFlags, true); |
+ optimizations.fOverrides.fUsePLSDstRead = false; |
SkASSERT(!optimizations.fColorPOI.isOpaque()); |
SkASSERT(!optimizations.fColorPOI.isSolidWhite()); |
@@ -688,6 +691,7 @@ static void test_color_opaque_with_coverage(skiatest::Reporter* reporter, const |
kA_GrColorComponentFlag, false); |
optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, 0, kNone_GrColorComponentFlags, |
true); |
+ optimizations.fOverrides.fUsePLSDstRead = false; |
SkASSERT(optimizations.fColorPOI.isOpaque()); |
SkASSERT(!optimizations.fColorPOI.isSolidWhite()); |
@@ -887,6 +891,7 @@ static void test_color_opaque_no_coverage(skiatest::Reporter* reporter, const Gr |
kG_GrColorComponentFlag | kA_GrColorComponentFlag, false); |
optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, GrColorPackA4(255), |
kRGBA_GrColorComponentFlags, true); |
+ optimizations.fOverrides.fUsePLSDstRead = false; |
SkASSERT(optimizations.fColorPOI.isOpaque()); |
SkASSERT(!optimizations.fColorPOI.isSolidWhite()); |
@@ -1103,9 +1108,7 @@ static void test_lcd_coverage_fallback_case(skiatest::Reporter* reporter, const |
GrBatchToXPOverrides* overrides) const override { |
color->setKnownFourComponents(GrColorPackRGBA(123, 45, 67, 221)); |
coverage->setUnknownFourComponents(); |
- coverage->setUsingLCDCoverage(); |
- overrides->fUsePLSDstRead = false; |
- } |
+ coverage->setUsingLCDCoverage(); } |
const char* name() const override { return "Test LCD Text Batch"; } |
void initBatchTracker(const GrXPOverridesForBatch&) override {} |