| OLD | NEW |
| 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 "GrBatchAtlas.h" | 10 #include "GrBatchAtlas.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 fInlineUploads[fInlineUpdatesIndex++]->upload(TextureUploader(fGpu))
; | 39 fInlineUploads[fInlineUpdatesIndex++]->upload(TextureUploader(fGpu))
; |
| 40 } | 40 } |
| 41 | 41 |
| 42 GrProgramDesc desc; | 42 GrProgramDesc desc; |
| 43 const GrPipeline* pipeline = bf->fPipeline; | 43 const GrPipeline* pipeline = bf->fPipeline; |
| 44 const GrPrimitiveProcessor* primProc = bf->fPrimitiveProcessor.get(); | 44 const GrPrimitiveProcessor* primProc = bf->fPrimitiveProcessor.get(); |
| 45 fGpu->buildProgramDesc(&desc, *primProc, *pipeline, bf->fBatchTracker); | 45 fGpu->buildProgramDesc(&desc, *primProc, *pipeline, bf->fBatchTracker); |
| 46 | 46 |
| 47 GrGpu::DrawArgs args(primProc, pipeline, &desc, &bf->fBatchTracker); | 47 GrGpu::DrawArgs args(primProc, pipeline, &desc, &bf->fBatchTracker); |
| 48 | 48 |
| 49 int drawCount = bf->fDraws.count(); | 49 int drawCount = bf->fVertexDraws.count(); |
| 50 const SkSTArray<1, DrawInfo, true>& draws = bf->fDraws; | 50 const SkSTArray<1, GrVertices, true>& vertexDraws = bf->fVertexDraws; |
| 51 for (int i = 0; i < drawCount; i++) { | 51 for (int i = 0; i < drawCount; i++) { |
| 52 fGpu->draw(args, draws[i]); | 52 fGpu->draw(args, vertexDraws[i]); |
| 53 } | 53 } |
| 54 } | 54 } |
| 55 } | 55 } |
| OLD | NEW |