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

Side by Side Diff: bench/GameBench.cpp

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 | « bench/GLVec4ScalarBench.cpp ('k') | bench/GeometryBench.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 2012 Google Inc. 2 * Copyright 2012 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 "Benchmark.h" 8 #include "Benchmark.h"
9 #include "SkCanvas.h" 9 #include "SkCanvas.h"
10 #include "SkPaint.h" 10 #include "SkPaint.h"
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 SkIRect src = fAtlasRects[curCell % (kNumAtlasedX)][curCell / (k NumAtlasedX)]; 194 SkIRect src = fAtlasRects[curCell % (kNumAtlasedX)][curCell / (k NumAtlasedX)];
195 195
196 if (fUseDrawVertices) { 196 if (fUseDrawVertices) {
197 SkPoint uvs[4] = { 197 SkPoint uvs[4] = {
198 { SkIntToScalar(src.fLeft), SkIntToScalar(src.fBottom) }, 198 { SkIntToScalar(src.fLeft), SkIntToScalar(src.fBottom) },
199 { SkIntToScalar(src.fLeft), SkIntToScalar(src.fTop) }, 199 { SkIntToScalar(src.fLeft), SkIntToScalar(src.fTop) },
200 { SkIntToScalar(src.fRight), SkIntToScalar(src.fTop) }, 200 { SkIntToScalar(src.fRight), SkIntToScalar(src.fTop) },
201 { SkIntToScalar(src.fRight), SkIntToScalar(src.fBottom) }, 201 { SkIntToScalar(src.fRight), SkIntToScalar(src.fBottom) },
202 }; 202 };
203 canvas->drawVertices(SkCanvas::kTriangles_VertexMode, 203 canvas->drawVertices(SkCanvas::kTriangles_VertexMode,
204 4, verts, uvs, NULL, NULL, 204 4, verts, uvs, nullptr, nullptr,
205 indices, 6, p2); 205 indices, 6, p2);
206 } else { 206 } else {
207 canvas->drawBitmapRect(fAtlas, src, dst, &p, 207 canvas->drawBitmapRect(fAtlas, src, dst, &p,
208 SkCanvas::kFast_SrcRectConstraint); 208 SkCanvas::kFast_SrcRectConstraint);
209 } 209 }
210 } else { 210 } else {
211 canvas->drawBitmapRect(fCheckerboard, dst, &p); 211 canvas->drawBitmapRect(fCheckerboard, dst, &p);
212 } 212 }
213 } 213 }
214 } 214 }
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 // Full clear 316 // Full clear
317 DEF_BENCH(return new GameBench(GameBench::kScale_Type, GameBench::kFull_Clear);) 317 DEF_BENCH(return new GameBench(GameBench::kScale_Type, GameBench::kFull_Clear);)
318 DEF_BENCH(return new GameBench(GameBench::kTranslate_Type, GameBench::kFull_Clea r);) 318 DEF_BENCH(return new GameBench(GameBench::kTranslate_Type, GameBench::kFull_Clea r);)
319 DEF_BENCH(return new GameBench(GameBench::kTranslate_Type, GameBench::kFull_Clea r, true);) 319 DEF_BENCH(return new GameBench(GameBench::kTranslate_Type, GameBench::kFull_Clea r, true);)
320 DEF_BENCH(return new GameBench(GameBench::kRotate_Type, GameBench::kFull_Clear); ) 320 DEF_BENCH(return new GameBench(GameBench::kRotate_Type, GameBench::kFull_Clear); )
321 321
322 // Atlased 322 // Atlased
323 DEF_BENCH(return new GameBench(GameBench::kTranslate_Type, GameBench::kFull_Clea r, false, true);) 323 DEF_BENCH(return new GameBench(GameBench::kTranslate_Type, GameBench::kFull_Clea r, false, true);)
324 DEF_BENCH(return new GameBench( 324 DEF_BENCH(return new GameBench(
325 GameBench::kTranslate_Type, GameBench::kFull_Clear, fal se, true, true);) 325 GameBench::kTranslate_Type, GameBench::kFull_Clear, fal se, true, true);)
OLDNEW
« no previous file with comments | « bench/GLVec4ScalarBench.cpp ('k') | bench/GeometryBench.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698