diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-01-20 18:22:52 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-20 18:23:05 +0000 |
| commit | 3329cceab5feca230df1caee16be045249228dc1 (patch) | |
| tree | 414e93f50fdf4269b018572cb46507b00284baed /include/gpu/effects | |
| parent | 67c18d6b5188a0497f6912a73d964c763d2f8f84 (diff) | |
Revert "Make it possible to query GrXPFactory for dst texture without GrPipelineAnalysis."
This reverts commit f833215420847565b4c9945aebdc2e7ae182937f.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> Make it possible to query GrXPFactory for dst texture without GrPipelineAnalysis.
>
> Change-Id: I8c140eb4e3e5f2d21ecbf8f8f3c8533dc7f50e7c
> Reviewed-on: https://skia-review.googlesource.com/7316
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I790afb9a01422cb4c2d3a4be4ecd20e8c4466b29
Reviewed-on: https://skia-review.googlesource.com/7342
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include/gpu/effects')
| -rw-r--r-- | include/gpu/effects/GrCoverageSetOpXP.h | 4 | ||||
| -rw-r--r-- | include/gpu/effects/GrPorterDuffXferProcessor.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/gpu/effects/GrCoverageSetOpXP.h b/include/gpu/effects/GrCoverageSetOpXP.h index 385cad865e..ca71abc4e0 100644 --- a/include/gpu/effects/GrCoverageSetOpXP.h +++ b/include/gpu/effects/GrCoverageSetOpXP.h @@ -40,7 +40,9 @@ private: bool hasMixedSamples, const DstTexture*) const override; - bool willReadDstColor(const GrCaps&, ColorType, CoverageType) const override { return false; } + bool onWillReadDstColor(const GrCaps&, const GrPipelineAnalysis&) const override { + return false; + } GR_DECLARE_XP_FACTORY_TEST; diff --git a/include/gpu/effects/GrPorterDuffXferProcessor.h b/include/gpu/effects/GrPorterDuffXferProcessor.h index 028cac65c8..ca14275926 100644 --- a/include/gpu/effects/GrPorterDuffXferProcessor.h +++ b/include/gpu/effects/GrPorterDuffXferProcessor.h @@ -63,7 +63,7 @@ private: bool hasMixedSamples, const DstTexture*) const override; - bool willReadDstColor(const GrCaps&, ColorType, CoverageType) const override; + bool onWillReadDstColor(const GrCaps&, const GrPipelineAnalysis&) const override; GR_DECLARE_XP_FACTORY_TEST; static void TestGetXPOutputTypes(const GrXferProcessor*, int* outPrimary, int* outSecondary); |