diff options
author | egdaniel <egdaniel@google.com> | 2015-01-22 10:16:09 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-22 10:16:09 -0800 |
commit | 8dd688b7569df569a672a8a67b2db86a9d376cfc (patch) | |
tree | e173468f68becd63d0796010c6ddf15215912d3b /src/gpu/GrGpu.h | |
parent | e44acc9617b875e2ffc84cdf938a5e359e8e8edb (diff) |
Rename GrOptDrawState to GrPipeline and GrDrawState to GrPipelineBuilder
BUG=skia:
Review URL: https://codereview.chromium.org/858343002
Diffstat (limited to 'src/gpu/GrGpu.h')
-rw-r--r-- | src/gpu/GrGpu.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h index 5bbc3dcb05..17bed8b9b1 100644 --- a/src/gpu/GrGpu.h +++ b/src/gpu/GrGpu.h @@ -15,11 +15,11 @@ class GrContext; class GrIndexBufferAllocPool; -class GrOptDrawState; class GrPath; class GrPathRange; class GrPathRenderer; class GrPathRendererChain; +class GrPipeline; class GrPrimitiveProcessor; class GrStencilBuffer; class GrVertexBufferAllocPool; @@ -306,7 +306,7 @@ public: virtual void buildProgramDesc(GrProgramDesc*, const GrPrimitiveProcessor&, - const GrOptDrawState&, + const GrPipeline&, const GrProgramDesc::DescInfo&, const GrBatchTracker&) const = 0; @@ -351,17 +351,17 @@ public: struct DrawArgs { typedef GrDrawTarget::DrawInfo DrawInfo; DrawArgs(const GrPrimitiveProcessor* primProc, - const GrOptDrawState* optState, + const GrPipeline* pipeline, const GrProgramDesc* desc, const GrBatchTracker* batchTracker) : fPrimitiveProcessor(primProc) - , fOptState(optState) + , fPipeline(pipeline) , fDesc(desc) , fBatchTracker(batchTracker) { - SkASSERT(primProc && optState && desc && batchTracker); + SkASSERT(primProc && pipeline && desc && batchTracker); } const GrPrimitiveProcessor* fPrimitiveProcessor; - const GrOptDrawState* fOptState; + const GrPipeline* fPipeline; const GrProgramDesc* fDesc; const GrBatchTracker* fBatchTracker; }; |