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

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

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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/batches/GrDrawVerticesBatch.cpp ('k') | src/gpu/batches/GrVertexBatch.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 #ifndef GrVertexBatch_DEFINED 8 #ifndef GrVertexBatch_DEFINED
9 #define GrVertexBatch_DEFINED 9 #define GrVertexBatch_DEFINED
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 GrVertices fVertices; 44 GrVertices fVertices;
45 }; 45 };
46 46
47 static const int kVerticesPerQuad = 4; 47 static const int kVerticesPerQuad = 4;
48 static const int kIndicesPerQuad = 6; 48 static const int kIndicesPerQuad = 6;
49 49
50 /** A specialization of InstanceHelper for quad rendering. */ 50 /** A specialization of InstanceHelper for quad rendering. */
51 class QuadHelper : private InstancedHelper { 51 class QuadHelper : private InstancedHelper {
52 public: 52 public:
53 QuadHelper() : INHERITED() {} 53 QuadHelper() : INHERITED() {}
54 /** Finds the cached quad index buffer and reserves vertex space. Return s NULL on failure 54 /** Finds the cached quad index buffer and reserves vertex space. Return s nullptr on failure
55 and on sucess a pointer to the vertex data that the caller should po pulate before 55 and on sucess a pointer to the vertex data that the caller should po pulate before
56 calling issueDraws(). */ 56 calling issueDraws(). */
57 void* init(Target* batchTarget, size_t vertexStride, int quadsToDraw); 57 void* init(Target* batchTarget, size_t vertexStride, int quadsToDraw);
58 58
59 using InstancedHelper::recordDraw; 59 using InstancedHelper::recordDraw;
60 private: 60 private:
61 typedef InstancedHelper INHERITED; 61 typedef InstancedHelper INHERITED;
62 }; 62 };
63 63
64 private: 64 private:
(...skipping 14 matching lines...) Expand all
79 // may use a different primitive processor. 79 // may use a different primitive processor.
80 SkTLList<DrawArray> fDrawArrays; 80 SkTLList<DrawArray> fDrawArrays;
81 81
82 // What is this? 82 // What is this?
83 GrBatchTracker fBatchTracker; 83 GrBatchTracker fBatchTracker;
84 84
85 typedef GrDrawBatch INHERITED; 85 typedef GrDrawBatch INHERITED;
86 }; 86 };
87 87
88 #endif 88 #endif
OLDNEW
« no previous file with comments | « src/gpu/batches/GrDrawVerticesBatch.cpp ('k') | src/gpu/batches/GrVertexBatch.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698