diff options
Diffstat (limited to 'bench/ETCBitmapBench.cpp')
| -rw-r--r-- | bench/ETCBitmapBench.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/bench/ETCBitmapBench.cpp b/bench/ETCBitmapBench.cpp index d5f32db3e0..aaa2ce7a66 100644 --- a/bench/ETCBitmapBench.cpp +++ b/bench/ETCBitmapBench.cpp @@ -5,8 +5,8 @@ * found in the LICENSE file. */ +#include "Benchmark.h" #include "Resources.h" -#include "SkBenchmark.h" #include "SkCanvas.h" #include "SkData.h" #include "SkDecodingImageGenerator.h" @@ -77,7 +77,7 @@ static etc1_byte* create_expanded_etc1_bitmap(const uint8_t* orig, int factor) { // the ETC1 benches should all be working on the same data. Due to the // simplicity of the PKM file, that data is the 128x128 mandrill etc1 // compressed texture repeated by some factor (currently 8 -> 1024x1024) -class ETCBitmapBenchBase : public SkBenchmark { +class ETCBitmapBenchBase : public Benchmark { public: ETCBitmapBenchBase() : fPKMData(loadPKM()) { if (NULL == fPKMData) { @@ -115,7 +115,7 @@ private: return SkData::NewFromMalloc(expandedETC1, dataSz); } - typedef SkBenchmark INHERITED; + typedef Benchmark INHERITED; }; // This is the rendering benchmark. Prior to rendering the data, create a @@ -220,16 +220,16 @@ private: typedef ETCBitmapBench INHERITED; }; -DEF_BENCH(return new ETCBitmapBench(false, SkBenchmark::kRaster_Backend);) -DEF_BENCH(return new ETCBitmapBench(true, SkBenchmark::kRaster_Backend);) +DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kRaster_Backend);) +DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kRaster_Backend);) -DEF_BENCH(return new ETCBitmapBench(false, SkBenchmark::kGPU_Backend);) -DEF_BENCH(return new ETCBitmapBench(true, SkBenchmark::kGPU_Backend);) +DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kGPU_Backend);) +DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kGPU_Backend);) -DEF_BENCH(return new ETCBitmapUploadBench(false, SkBenchmark::kRaster_Backend);) -DEF_BENCH(return new ETCBitmapUploadBench(true, SkBenchmark::kRaster_Backend);) +DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kRaster_Backend);) +DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kRaster_Backend);) -DEF_BENCH(return new ETCBitmapUploadBench(false, SkBenchmark::kGPU_Backend);) -DEF_BENCH(return new ETCBitmapUploadBench(true, SkBenchmark::kGPU_Backend);) +DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kGPU_Backend);) +DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kGPU_Backend);) #endif // SK_IGNORE_ETC1_SUPPORT |