| Index: include/gpu/GrXferProcessor.h
|
| diff --git a/include/gpu/GrXferProcessor.h b/include/gpu/GrXferProcessor.h
|
| index 3a698143c32322a4345eb8fd67dffe226fe77094..1d4717e1569dd4f1799582242b859bf9d6e39fba 100644
|
| --- a/include/gpu/GrXferProcessor.h
|
| +++ b/include/gpu/GrXferProcessor.h
|
| @@ -323,8 +323,7 @@ public:
|
| virtual void getInvariantBlendedColor(const GrProcOptInfo& colorPOI,
|
| InvariantBlendedColor*) const = 0;
|
|
|
| - bool willNeedDstTexture(const GrCaps& caps, const GrPipelineOptimizations& optimizations,
|
| - bool hasMixedSamples) const;
|
| + bool willNeedDstTexture(const GrCaps& caps, const GrPipelineOptimizations& optimizations) const;
|
|
|
| bool isEqual(const GrXPFactory& that) const {
|
| if (this->classID() != that.classID()) {
|
| @@ -358,16 +357,12 @@ private:
|
|
|
| virtual bool onIsEqual(const GrXPFactory&) const = 0;
|
|
|
| - bool willReadDstColor(const GrCaps& caps,
|
| - const GrPipelineOptimizations& optimizations,
|
| - bool hasMixedSamples) const;
|
| + bool willReadDstColor(const GrCaps&, const GrPipelineOptimizations&) const;
|
| /**
|
| * Returns true if the XP generated by this factory will explicitly read dst in the fragment
|
| * shader.
|
| */
|
| - virtual bool onWillReadDstColor(const GrCaps& caps,
|
| - const GrPipelineOptimizations& optimizations,
|
| - bool hasMixedSamples) const = 0;
|
| + virtual bool onWillReadDstColor(const GrCaps&, const GrPipelineOptimizations&) const = 0;
|
|
|
| static uint32_t GenClassID() {
|
| // fCurrXPFactoryID has been initialized to kIllegalXPFactoryID. The
|
|
|