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

Side by Side Diff: src/gpu/GrBatchTarget.cpp

Issue 894273002: Revert of Hairline batch (Closed) Base URL: https://skia.googlesource.com/skia.git@2_defer
Patch Set: Created 5 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 | « src/gpu/GrBatchTarget.h ('k') | src/gpu/GrInOrderDrawBuffer.cpp » ('j') | 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 "GrBatchTarget.h" 8 #include "GrBatchTarget.h"
9 9
10 #include "GrBufferAllocPool.h" 10 #include "GrBufferAllocPool.h"
(...skipping 14 matching lines...) Expand all
25 bf->fBatchTracker); 25 bf->fBatchTracker);
26 26
27 GrGpu::DrawArgs args(primProc, pipeline, &desc, &bf->fBatchTracker); 27 GrGpu::DrawArgs args(primProc, pipeline, &desc, &bf->fBatchTracker);
28 for (int i = 0; i < bf->fDraws.count(); i++) { 28 for (int i = 0; i < bf->fDraws.count(); i++) {
29 fGpu->draw(args, bf->fDraws[i]); 29 fGpu->draw(args, bf->fDraws[i]);
30 } 30 }
31 } 31 }
32 fFlushBuffer.reset(); 32 fFlushBuffer.reset();
33 }*/ 33 }*/
34 34
35 void GrBatchTarget::flushNext(int n) { 35 void GrBatchTarget::flushNext() {
36 for (; n > 0; n--) { 36 fIter.next();
37 SkDEBUGCODE(bool verify =) fIter.next(); 37 GrProgramDesc desc;
38 SkASSERT(verify); 38 BufferedFlush* bf = fIter.get();
39 GrProgramDesc desc; 39 const GrPipeline* pipeline = bf->fPipeline;
40 BufferedFlush* bf = fIter.get(); 40 const GrPrimitiveProcessor* primProc = bf->fPrimitiveProcessor.get();
41 const GrPipeline* pipeline = bf->fPipeline; 41 fGpu->buildProgramDesc(&desc, *primProc, *pipeline, pipeline->descInfo(),
42 const GrPrimitiveProcessor* primProc = bf->fPrimitiveProcessor.get(); 42 bf->fBatchTracker);
43 fGpu->buildProgramDesc(&desc, *primProc, *pipeline, pipeline->descInfo() ,
44 bf->fBatchTracker);
45 43
46 GrGpu::DrawArgs args(primProc, pipeline, &desc, &bf->fBatchTracker); 44 GrGpu::DrawArgs args(primProc, pipeline, &desc, &bf->fBatchTracker);
47 for (int i = 0; i < bf->fDraws.count(); i++) { 45 for (int i = 0; i < bf->fDraws.count(); i++) {
48 fGpu->draw(args, bf->fDraws[i]); 46 fGpu->draw(args, bf->fDraws[i]);
49 }
50 } 47 }
51 } 48 }
OLDNEW
« no previous file with comments | « src/gpu/GrBatchTarget.h ('k') | src/gpu/GrInOrderDrawBuffer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698