From e62cbdffcf27278272e87de65a07dddc24605ad7 Mon Sep 17 00:00:00 2001 From: cdalton Date: Wed, 3 Feb 2016 13:29:19 -0800 Subject: [PATCH] Fix assert accessing pipeline from initBatchTracker Marks fPipelineInstalled as true before calling initBatchTracker. The batch subclass ought to be able to access the newly constructed pipeline object during its init. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1666813002 Review URL: https://codereview.chromium.org/1666813002 --- src/gpu/batches/GrDrawBatch.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gpu/batches/GrDrawBatch.cpp b/src/gpu/batches/GrDrawBatch.cpp index 4253923..b73f751 100644 --- a/src/gpu/batches/GrDrawBatch.cpp +++ b/src/gpu/batches/GrDrawBatch.cpp @@ -29,7 +29,7 @@ bool GrDrawBatch::installPipeline(const GrPipeline::CreateArgs& args) { if (!GrPipeline::CreateAt(location, args, &overrides)) { return false; } - this->initBatchTracker(overrides); fPipelineInstalled = true; + this->initBatchTracker(overrides); return true; } -- 2.7.4