From 1fa4572d1a32e9fbf102d7388efe5e44bef460f1 Mon Sep 17 00:00:00 2001 From: cdalton Date: Tue, 2 Jun 2015 10:43:39 -0700 Subject: Update XPF invariant info to not account for conflation Renames getInvariantOutput to getInvariantBlendedColor on GrXPFactory and redefines it to not account for coverage conflation. This is the information that all the callsites actually wanted to know. BUG=skia: Review URL: https://codereview.chromium.org/1161273005 --- src/gpu/GrDrawTarget.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpu/GrDrawTarget.h') diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h index c1eca9a81e..30a6cee4fa 100644 --- a/src/gpu/GrDrawTarget.h +++ b/src/gpu/GrDrawTarget.h @@ -229,8 +229,8 @@ protected: const GrBatch* batch, const SkRect* devBounds, GrDrawTarget* target); - bool willBlendWithDst(const GrPrimitiveProcessor* primProc) const { - return fPipelineBuilder->willBlendWithDst(primProc); + bool willColorBlendWithDst(const GrPrimitiveProcessor* primProc) const { + return fPipelineBuilder->willColorBlendWithDst(primProc); } private: friend class GrDrawTarget; -- cgit v1.2.3