OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2014 Google Inc. | 2 * Copyright 2014 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 "Resources.h" | 9 #include "Resources.h" |
10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
203 SkASSERT(kRaster_Backend == this->backend()); | 203 SkASSERT(kRaster_Backend == this->backend()); |
204 if (this->decompress()) { | 204 if (this->decompress()) { |
205 return "etc1bitmap_upload_raster_decompressed"; | 205 return "etc1bitmap_upload_raster_decompressed"; |
206 } else { | 206 } else { |
207 return "etc1bitmap_upload_raster_compressed"; | 207 return "etc1bitmap_upload_raster_compressed"; |
208 } | 208 } |
209 } | 209 } |
210 } | 210 } |
211 | 211 |
212 virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { | 212 virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE { |
| 213 SkPixelRef* pr = fBitmap.pixelRef(); |
213 for (int i = 0; i < loops; ++i) { | 214 for (int i = 0; i < loops; ++i) { |
214 this->fBitmap.pixelRef()->notifyPixelsChanged(); | 215 if (pr) { |
| 216 pr->notifyPixelsChanged(); |
| 217 } |
215 canvas->drawBitmap(this->fBitmap, 0, 0, NULL); | 218 canvas->drawBitmap(this->fBitmap, 0, 0, NULL); |
216 } | 219 } |
217 } | 220 } |
218 | 221 |
219 private: | 222 private: |
220 typedef ETCBitmapBench INHERITED; | 223 typedef ETCBitmapBench INHERITED; |
221 }; | 224 }; |
222 | 225 |
223 DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kRaster_Backend);) | 226 DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kRaster_Backend);) |
224 DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kRaster_Backend);) | 227 DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kRaster_Backend);) |
225 | 228 |
226 DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kGPU_Backend);) | 229 DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kGPU_Backend);) |
227 DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kGPU_Backend);) | 230 DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kGPU_Backend);) |
228 | 231 |
229 DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kRaster_Backend);) | 232 DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kRaster_Backend);) |
230 DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kRaster_Backend);) | 233 DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kRaster_Backend);) |
231 | 234 |
232 DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kGPU_Backend);) | 235 DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kGPU_Backend);) |
233 DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kGPU_Backend);) | 236 DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kGPU_Backend);) |
234 | 237 |
235 #endif // SK_IGNORE_ETC1_SUPPORT | 238 #endif // SK_IGNORE_ETC1_SUPPORT |
OLD | NEW |