added a default constructor for GrBatchToXPOverrides
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1657803002
Review URL: https://codereview.chromium.org/1657803002
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h
index 60d0cab..10ffc86 100644
--- a/src/gpu/GrPipeline.h
+++ b/src/gpu/GrPipeline.h
@@ -25,6 +25,9 @@
class GrPipelineBuilder;
struct GrBatchToXPOverrides {
+ GrBatchToXPOverrides()
+ : fUsePLSDstRead(false) {}
+
bool fUsePLSDstRead;
};
diff --git a/src/gpu/batches/GrDrawBatch.cpp b/src/gpu/batches/GrDrawBatch.cpp
index 78bbd3b..4253923 100644
--- a/src/gpu/batches/GrDrawBatch.cpp
+++ b/src/gpu/batches/GrDrawBatch.cpp
@@ -18,7 +18,6 @@
void GrDrawBatch::getPipelineOptimizations(GrPipelineOptimizations* opt) const {
GrInitInvariantOutput color;
GrInitInvariantOutput coverage;
- opt->fOverrides.fUsePLSDstRead = false;
this->computePipelineOptimizations(&color, &coverage, &opt->fOverrides);
opt->fColorPOI.initUsingInvariantOutput(color);
opt->fCoveragePOI.initUsingInvariantOutput(coverage);
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
index 73d30aa..f738c97 100644
--- a/tests/GrPorterDuffTest.cpp
+++ b/tests/GrPorterDuffTest.cpp
@@ -98,7 +98,6 @@
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());
@@ -291,7 +290,6 @@
false);
optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, 0, kNone_GrColorComponentFlags,
true);
- optimizations.fOverrides.fUsePLSDstRead = false;
SkASSERT(!optimizations.fColorPOI.isOpaque());
SkASSERT(!optimizations.fColorPOI.isSolidWhite());
@@ -486,7 +484,6 @@
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());
@@ -691,7 +688,6 @@
kA_GrColorComponentFlag, false);
optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, 0, kNone_GrColorComponentFlags,
true);
- optimizations.fOverrides.fUsePLSDstRead = false;
SkASSERT(optimizations.fColorPOI.isOpaque());
SkASSERT(!optimizations.fColorPOI.isSolidWhite());
@@ -891,7 +887,6 @@
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());
@@ -1193,7 +1188,6 @@
GrPipelineOptimizations optimizations;
optimizations.fColorPOI.calcWithInitialValues(nullptr, 0, testColors[c], testColorFlags[c],
false);
- optimizations.fOverrides.fUsePLSDstRead = false;
for (int f = 0; f <= 1; f++) {
if (!f) {
optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, 0,