diff options
author | Brian Salomon <bsalomon@google.com> | 2017-07-12 16:58:54 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-12 16:59:04 +0000 |
commit | beae8a9faa2afcdbeeec96e658db7e113a4fa1c9 (patch) | |
tree | a37d25e80c2c45675511036b351d8ea72b49a42a /src/gpu/GrOpFlushState.h | |
parent | 1c8bb8a4c63c327fb856a41e1b0b19775eac0ac1 (diff) |
Revert "Make DashOp a non-legacy GrMeshDrawOp."
This reverts commit ebb38256c65f2d799dd64f0274256a0c1deffed1.
Reason for revert: Assertions on ANGLE bots
Original change's description:
> Make DashOp a non-legacy GrMeshDrawOp.
>
> Change-Id: I84ee3c64a5af8889e9a122cbc08d70ed6b25fbab
> Reviewed-on: https://skia-review.googlesource.com/22210
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com
Change-Id: I886a0bd75221f05d737d8b27c6b3d8d6cce5573c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/22680
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrOpFlushState.h')
-rw-r--r-- | src/gpu/GrOpFlushState.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/gpu/GrOpFlushState.h b/src/gpu/GrOpFlushState.h index 42daab3960..b5cacfa0fe 100644 --- a/src/gpu/GrOpFlushState.h +++ b/src/gpu/GrOpFlushState.h @@ -245,18 +245,6 @@ public: return this->state()->allocPipeline(std::forward<Args>(args)...); } - GrPipeline* makePipeline(uint32_t pipelineFlags, const GrProcessorSet* processorSet) { - GrPipeline::InitArgs pipelineArgs; - pipelineArgs.fFlags = pipelineFlags; - pipelineArgs.fProcessors = processorSet; - pipelineArgs.fRenderTarget = this->renderTarget(); - pipelineArgs.fAppliedClip = this->clip(); - pipelineArgs.fDstProxy = this->dstProxy(); - pipelineArgs.fCaps = &this->caps(); - pipelineArgs.fResourceProvider = this->resourceProvider(); - return this->allocPipeline(pipelineArgs); - } - private: GrMeshDrawOp* meshDrawOp() { return static_cast<GrMeshDrawOp*>(this->op()); } typedef GrDrawOp::Target INHERITED; |