| Index: src/gpu/GrOptDrawState.h
|
| diff --git a/src/gpu/GrOptDrawState.h b/src/gpu/GrOptDrawState.h
|
| index 6beeea2f874855448ba181b42313f1fa77534b8d..fca0c4a9e8b91e82795811f0b5fc3d0ac413e225 100644
|
| --- a/src/gpu/GrOptDrawState.h
|
| +++ b/src/gpu/GrOptDrawState.h
|
| @@ -17,9 +17,9 @@
|
| #include "SkMatrix.h"
|
| #include "SkRefCnt.h"
|
|
|
| +class GrBatch;
|
| class GrDeviceCoordTexture;
|
| class GrDrawState;
|
| -class GrPathProcessor;
|
|
|
| /**
|
| * Class that holds an optimized version of a GrDrawState. It is meant to be an immutable class,
|
| @@ -29,10 +29,17 @@ class GrOptDrawState {
|
| public:
|
| SK_DECLARE_INST_COUNT(GrOptDrawState)
|
|
|
| + // TODO get rid of this version of the constructor when we use batch everywhere
|
| GrOptDrawState(const GrDrawState& drawState, const GrPrimitiveProcessor*,
|
| const GrDrawTargetCaps&, const GrScissorState&,
|
| const GrDeviceCoordTexture* dstCopy, GrGpu::DrawType);
|
|
|
| + GrOptDrawState(GrBatch*,
|
| + const GrDrawState& drawState,
|
| + const GrDrawTargetCaps&, const GrScissorState&,
|
| + const GrDeviceCoordTexture* dstCopy, GrGpu::DrawType);
|
| +
|
| +
|
| /*
|
| * Returns true if it is possible to combine the two GrOptDrawStates and it will update 'this'
|
| * to subsume 'that''s draw.
|
| @@ -137,6 +144,15 @@ public:
|
| const GrGeometryProcessor::InitBT& getInitBatchTracker() const { return fInitBT; }
|
|
|
| private:
|
| + // TODO we can have one constructor once GrBatch is complete
|
| + void internalConstructor(const GrDrawState&,
|
| + const GrProcOptInfo& colorPOI,
|
| + const GrProcOptInfo& coveragePOI,
|
| + const GrDrawTargetCaps&,
|
| + const GrScissorState&,
|
| + const GrDeviceCoordTexture* dstCopy,
|
| + GrGpu::DrawType);
|
| +
|
| /**
|
| * Alter the program desc and inputs (attribs and processors) based on the blend optimization.
|
| */
|
|
|