Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(840)

Side by Side Diff: src/gpu/batches/GrDrawBatch.cpp

Issue 1666813002: Fix assert accessing pipeline from initBatchTracker (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrDrawBatch.h" 8 #include "GrDrawBatch.h"
9 9
10 GrDrawBatch::GrDrawBatch(uint32_t classID) : INHERITED(classID), fPipelineInstal led(false) { } 10 GrDrawBatch::GrDrawBatch(uint32_t classID) : INHERITED(classID), fPipelineInstal led(false) { }
(...skipping 11 matching lines...) Expand all
22 opt->fColorPOI.initUsingInvariantOutput(color); 22 opt->fColorPOI.initUsingInvariantOutput(color);
23 opt->fCoveragePOI.initUsingInvariantOutput(coverage); 23 opt->fCoveragePOI.initUsingInvariantOutput(coverage);
24 } 24 }
25 25
26 bool GrDrawBatch::installPipeline(const GrPipeline::CreateArgs& args) { 26 bool GrDrawBatch::installPipeline(const GrPipeline::CreateArgs& args) {
27 GrXPOverridesForBatch overrides; 27 GrXPOverridesForBatch overrides;
28 void* location = fPipelineStorage.get(); 28 void* location = fPipelineStorage.get();
29 if (!GrPipeline::CreateAt(location, args, &overrides)) { 29 if (!GrPipeline::CreateAt(location, args, &overrides)) {
30 return false; 30 return false;
31 } 31 }
32 fPipelineInstalled = true;
32 this->initBatchTracker(overrides); 33 this->initBatchTracker(overrides);
33 fPipelineInstalled = true;
34 return true; 34 return true;
35 } 35 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698