aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/ops/GrMeshDrawOp.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-07-19 13:50:54 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-19 18:16:05 +0000
commite5b399ee69332e0d68a660d6695d1182a4cb16b1 (patch)
tree25fefab7cc05a848a7f88b0cb51bd568ad02d67f /src/gpu/ops/GrMeshDrawOp.cpp
parent6d66237a034fb2b3051ea9247a7ba728907abb4a (diff)
Remove GrLegacyMeshDrawOp and GrPipelineBuilder
Change-Id: Ib301a0e7d4b4c4f05417d28862017307949748c9 Reviewed-on: https://skia-review.googlesource.com/23584 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/ops/GrMeshDrawOp.cpp')
-rw-r--r--src/gpu/ops/GrMeshDrawOp.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/ops/GrMeshDrawOp.cpp b/src/gpu/ops/GrMeshDrawOp.cpp
index 48f2ea67d3..e42f3197b8 100644
--- a/src/gpu/ops/GrMeshDrawOp.cpp
+++ b/src/gpu/ops/GrMeshDrawOp.cpp
@@ -95,7 +95,7 @@ void GrMeshDrawOp::Target::draw(const GrGeometryProcessor* gp, const GrPipeline*
if (!op->fQueuedDraws.empty()) {
// If the last draw shares a geometry processor and pipeline and there are no intervening
// uploads, add this mesh to it.
- GrLegacyMeshDrawOp::QueuedDraw& lastDraw = op->fQueuedDraws.back();
+ GrMeshDrawOp::QueuedDraw& lastDraw = op->fQueuedDraws.back();
if (lastDraw.fGeometryProcessor == gp && lastDraw.fPipeline == pipeline &&
(op->fInlineUploads.empty() ||
op->fInlineUploads.back().fUploadBeforeToken != this->nextDrawToken())) {
@@ -103,7 +103,7 @@ void GrMeshDrawOp::Target::draw(const GrGeometryProcessor* gp, const GrPipeline*
return;
}
}
- GrLegacyMeshDrawOp::QueuedDraw& draw = op->fQueuedDraws.push_back();
+ GrMeshDrawOp::QueuedDraw& draw = op->fQueuedDraws.push_back();
GrDrawOpUploadToken token = this->state()->issueDrawToken();
draw.fGeometryProcessor.reset(gp);
draw.fPipeline = pipeline;