| Index: src/gpu/GrDrawTarget.h
|
| diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
|
| index 9cb91e345d5a80be534db6cfc6ba00070c74d2f5..a5e3b8efee3eb852dcb705bef5ae5281bd892036 100644
|
| --- a/src/gpu/GrDrawTarget.h
|
| +++ b/src/gpu/GrDrawTarget.h
|
| @@ -18,7 +18,6 @@
|
| #include "GrPipelineBuilder.h"
|
| #include "GrTraceMarker.h"
|
| #include "GrVertexBuffer.h"
|
| -#include "GrXferProcessor.h"
|
|
|
| #include "SkClipStack.h"
|
| #include "SkMatrix.h"
|
| @@ -231,7 +230,7 @@
|
| bool setupDstReadIfNecessary(const GrPipelineBuilder&,
|
| const GrProcOptInfo& colorPOI,
|
| const GrProcOptInfo& coveragePOI,
|
| - GrXferProcessor::DstTexture*,
|
| + GrDeviceCoordTexture* dstCopy,
|
| const SkRect* drawBounds);
|
|
|
| struct PipelineInfo {
|
| @@ -251,11 +250,11 @@
|
|
|
| bool mustSkipDraw() const { return (NULL == fPipelineBuilder); }
|
|
|
| - GrPipelineBuilder* fPipelineBuilder;
|
| - GrScissorState* fScissor;
|
| - GrProcOptInfo fColorPOI;
|
| - GrProcOptInfo fCoveragePOI;
|
| - GrXferProcessor::DstTexture fDstTexture;
|
| + GrPipelineBuilder* fPipelineBuilder;
|
| + GrScissorState* fScissor;
|
| + GrProcOptInfo fColorPOI;
|
| + GrProcOptInfo fCoveragePOI;
|
| + GrDeviceCoordTexture fDstCopy;
|
| };
|
|
|
| void setupPipeline(const PipelineInfo& pipelineInfo, GrPipeline* pipeline);
|
|
|