diff options
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DM.cpp | 4 | ||||
| -rw-r--r-- | dm/DMBenchTask.cpp | 4 | ||||
| -rw-r--r-- | dm/DMGpuGMTask.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -88,7 +88,7 @@ static void kick_off_gms(const SkTDArray<GMRegistry::Factory>& gms, for (int i = 0; i < gms.count(); i++) { for (int j = 0; j < configs.count(); j++) { START("565", CpuGMTask, kRGB_565_SkColorType); - START("8888", CpuGMTask, kPMColor_SkColorType); + START("8888", CpuGMTask, kN32_SkColorType); START("gpu", GpuGMTask, native, 0); START("msaa4", GpuGMTask, native, 4); START("msaa16", GpuGMTask, native, 16); @@ -115,7 +115,7 @@ static void kick_off_benches(const SkTDArray<BenchRegistry::Factory>& benches, for (int j = 0; j < configs.count(); j++) { START("nonrendering", NonRenderingBenchTask); START("565", CpuBenchTask, kRGB_565_SkColorType); - START("8888", CpuBenchTask, kPMColor_SkColorType); + START("8888", CpuBenchTask, kN32_SkColorType); START("gpu", GpuBenchTask, native, 0); START("msaa4", GpuBenchTask, native, 4); START("msaa16", GpuBenchTask, native, 16); diff --git a/dm/DMBenchTask.cpp b/dm/DMBenchTask.cpp index c53daf95b4..bcedb96f25 100644 --- a/dm/DMBenchTask.cpp +++ b/dm/DMBenchTask.cpp @@ -63,7 +63,7 @@ static void draw_raster(SkBenchmark* bench, SkColorType colorType) { } void NonRenderingBenchTask::draw() { - draw_raster(fBench.get(), kPMColor_SkColorType); + draw_raster(fBench.get(), kN32_SkColorType); } void CpuBenchTask::draw() { @@ -73,7 +73,7 @@ void CpuBenchTask::draw() { void GpuBenchTask::draw(GrContextFactory* grFactory) { SkImageInfo info = SkImageInfo::Make(fBench->getSize().x(), fBench->getSize().y(), - kPMColor_SkColorType, + kN32_SkColorType, kPremul_SkAlphaType); SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, info, fSampleCount)); diff --git a/dm/DMGpuGMTask.cpp b/dm/DMGpuGMTask.cpp index c4867b6e9e..c72f675660 100644 --- a/dm/DMGpuGMTask.cpp +++ b/dm/DMGpuGMTask.cpp @@ -27,7 +27,7 @@ GpuGMTask::GpuGMTask(const char* config, void GpuGMTask::draw(GrContextFactory* grFactory) { SkImageInfo info = SkImageInfo::Make(SkScalarCeilToInt(fGM->width()), SkScalarCeilToInt(fGM->height()), - kPMColor_SkColorType, + kN32_SkColorType, kPremul_SkAlphaType); SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, info, fSampleCount)); SkCanvas* canvas = surface->getCanvas(); |