diff options
author | Brian Salomon <bsalomon@google.com> | 2017-03-29 12:09:15 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-29 16:46:07 +0000 |
commit | e7d30484ea8a5677a9403ccd23a9c0961df62ccd (patch) | |
tree | 140df99fdbf67a023fa0b31223b9c5169774f29f /tests | |
parent | 4a24e10a0b805af6106dd8f7225c10a703696245 (diff) |
Remove GrPipelineOptimizations computation from GrPipeline::init and nest in GrMeshDrawOp.
Change-Id: I4a702c83857606c1cb050294c408922eef5769ea
Reviewed-on: https://skia-review.googlesource.com/10414
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/GrPorterDuffTest.cpp | 2 | ||||
-rw-r--r-- | tests/PreFlushCallbackTest.cpp | 2 | ||||
-rw-r--r-- | tests/PrimitiveProcessorTest.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index 46f9f6e27a..0170488158 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -1003,7 +1003,7 @@ static void test_lcd_coverage_fallback_case(skiatest::Reporter* reporter, const *coverage = GrPipelineAnalysisCoverage::kLCD; } - void applyPipelineOptimizations(const GrPipelineOptimizations&) override {} + void applyPipelineOptimizations(const PipelineOptimizations&) override {} bool onCombineIfPossible(GrOp*, const GrCaps&) override { return false; } void onPrepareDraws(Target*) const override {} diff --git a/tests/PreFlushCallbackTest.cpp b/tests/PreFlushCallbackTest.cpp index e008009efd..7c4092cca2 100644 --- a/tests/PreFlushCallbackTest.cpp +++ b/tests/PreFlushCallbackTest.cpp @@ -70,7 +70,7 @@ private: *coverage = GrPipelineAnalysisCoverage::kSingleChannel; } - void applyPipelineOptimizations(const GrPipelineOptimizations& optimizations) override { + void applyPipelineOptimizations(const PipelineOptimizations& optimizations) override { optimizations.getOverrideColorIfSet(&fColor); } diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp index 0a9d0021f0..2b4e3494a8 100644 --- a/tests/PrimitiveProcessorTest.cpp +++ b/tests/PrimitiveProcessorTest.cpp @@ -46,7 +46,7 @@ private: *coverage = GrPipelineAnalysisCoverage::kSingleChannel; } - void applyPipelineOptimizations(const GrPipelineOptimizations&) override {} + void applyPipelineOptimizations(const PipelineOptimizations&) override {} bool onCombineIfPossible(GrOp*, const GrCaps&) override { return false; } void onPrepareDraws(Target* target) const override { class GP : public GrGeometryProcessor { |