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

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

Issue 1457123002: Make block size a template parameter of SkTLList (Closed) Base URL: https://skia.googlesource.com/skia.git@forward
Patch Set: another missing typename Created 5 years, 1 month 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/batches/GrVertexBatch.h ('k') | tests/LListTest.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 "GrVertexBatch.h" 8 #include "GrVertexBatch.h"
9 #include "GrBatchFlushState.h" 9 #include "GrBatchFlushState.h"
10 #include "GrResourceProvider.h" 10 #include "GrResourceProvider.h"
11 11
12 GrVertexBatch::GrVertexBatch(uint32_t classID) : INHERITED(classID), fDrawArrays (1) {} 12 GrVertexBatch::GrVertexBatch(uint32_t classID) : INHERITED(classID) {}
13 13
14 void GrVertexBatch::onPrepare(GrBatchFlushState* state) { 14 void GrVertexBatch::onPrepare(GrBatchFlushState* state) {
15 Target target(state, this); 15 Target target(state, this);
16 this->onPrepareDraws(&target); 16 this->onPrepareDraws(&target);
17 } 17 }
18 18
19 void* GrVertexBatch::InstancedHelper::init(Target* target, GrPrimitiveType primT ype, 19 void* GrVertexBatch::InstancedHelper::init(Target* target, GrPrimitiveType primT ype,
20 size_t vertexStride, const GrIndexBuf fer* indexBuffer, 20 size_t vertexStride, const GrIndexBuf fer* indexBuffer,
21 int verticesPerInstance, int indicesP erInstance, 21 int verticesPerInstance, int indicesP erInstance,
22 int instancesToDraw) { 22 int instancesToDraw) {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 return this->INHERITED::init(target, kTriangles_GrPrimitiveType, vertexStrid e, 58 return this->INHERITED::init(target, kTriangles_GrPrimitiveType, vertexStrid e,
59 quadIndexBuffer, kVerticesPerQuad, kIndicesPerQ uad, quadsToDraw); 59 quadIndexBuffer, kVerticesPerQuad, kIndicesPerQ uad, quadsToDraw);
60 } 60 }
61 61
62 void GrVertexBatch::onDraw(GrBatchFlushState* state) { 62 void GrVertexBatch::onDraw(GrBatchFlushState* state) {
63 int uploadCnt = fInlineUploads.count(); 63 int uploadCnt = fInlineUploads.count();
64 int currUpload = 0; 64 int currUpload = 0;
65 65
66 // Iterate of all the drawArrays. Before issuing the draws in each array, pe rform any inline 66 // Iterate of all the drawArrays. Before issuing the draws in each array, pe rform any inline
67 // uploads. 67 // uploads.
68 for (SkTLList<DrawArray>::Iter da(fDrawArrays); da.get(); da.next()) { 68 for (DrawArrayList::Iter da(fDrawArrays); da.get(); da.next()) {
69 state->advanceLastFlushedToken(); 69 state->advanceLastFlushedToken();
70 while (currUpload < uploadCnt && 70 while (currUpload < uploadCnt &&
71 fInlineUploads[currUpload]->lastUploadToken() <= state->lastFlush edToken()) { 71 fInlineUploads[currUpload]->lastUploadToken() <= state->lastFlush edToken()) {
72 fInlineUploads[currUpload++]->upload(state->uploader()); 72 fInlineUploads[currUpload++]->upload(state->uploader());
73 } 73 }
74 const GrVertexBatch::DrawArray& drawArray = *da.get(); 74 const GrVertexBatch::DrawArray& drawArray = *da.get();
75 GrProgramDesc desc; 75 GrProgramDesc desc;
76 const GrPipeline* pipeline = this->pipeline(); 76 const GrPipeline* pipeline = this->pipeline();
77 const GrPrimitiveProcessor* primProc = drawArray.fPrimitiveProcessor.get (); 77 const GrPrimitiveProcessor* primProc = drawArray.fPrimitiveProcessor.get ();
78 state->gpu()->buildProgramDesc(&desc, *primProc, *pipeline); 78 state->gpu()->buildProgramDesc(&desc, *primProc, *pipeline);
79 GrGpu::DrawArgs args(primProc, pipeline, &desc); 79 GrGpu::DrawArgs args(primProc, pipeline, &desc);
80 80
81 int drawCount = drawArray.fDraws.count(); 81 int drawCount = drawArray.fDraws.count();
82 for (int i = 0; i < drawCount; i++) { 82 for (int i = 0; i < drawCount; i++) {
83 state->gpu()->draw(args, drawArray.fDraws[i]); 83 state->gpu()->draw(args, drawArray.fDraws[i]);
84 } 84 }
85 } 85 }
86 } 86 }
OLDNEW
« no previous file with comments | « src/gpu/batches/GrVertexBatch.h ('k') | tests/LListTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698