diff options
| author |  ethannicholas <ethannicholas@google.com> | 2016-02-01 11:45:45 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-01 11:45:45 -0800 |
| commit | 3b7af78e813d182d61483fbfc317f26507adf778 (patch) | |
| tree | b9029c608c63d7dae181e5c4ce8c4d29c5f0be69 | |
| parent | 6404981b0c3984ba91b3bda35e60c6c8a8a773c2 (diff) | |
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
| -rw-r--r-- | src/gpu/GrPipeline.h | 3 | ||||
| -rw-r--r-- | src/gpu/batches/GrDrawBatch.cpp | 1 | ||||
| -rw-r--r-- | tests/GrPorterDuffTest.cpp | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/gpu/GrPipeline.h b/src/gpu/GrPipeline.h index 60d0cab1ab..10ffc865f0 100644 --- a/src/gpu/GrPipeline.h +++ b/src/gpu/GrPipeline.h @@ -25,6 +25,9 @@ class GrDeviceCoordTexture; class GrPipelineBuilder; struct GrBatchToXPOverrides { + GrBatchToXPOverrides() + : fUsePLSDstRead(false) {} + bool fUsePLSDstRead; }; diff --git a/src/gpu/batches/GrDrawBatch.cpp b/src/gpu/batches/GrDrawBatch.cpp index 78bbd3bafe..4253923f33 100644 --- a/src/gpu/batches/GrDrawBatch.cpp +++ b/src/gpu/batches/GrDrawBatch.cpp @@ -18,7 +18,6 @@ GrDrawBatch::~GrDrawBatch() { 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 73d30aa023..f738c97a94 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -98,7 +98,6 @@ 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()); @@ -291,7 +290,6 @@ 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()); @@ -486,7 +484,6 @@ 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()); @@ -691,7 +688,6 @@ 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()); @@ -891,7 +887,6 @@ 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()); @@ -1193,7 +1188,6 @@ DEF_GPUTEST(PorterDuffNoDualSourceBlending, reporter, /*factory*/) { 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, |