AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch non-MPD nanobench path to use a separate canvas per tile

Browse Source 
It is desirable that, when layer hoisting is disabled, the MPD and non-MPD timings be
roughly the same. Unfortunately, using a separate canvas for each tile (a requirement
for MPD) introduces its own discrepancy into the timing. Using a separate canvas for
each tile doesn't seem to make a difference for 8888 (see the non-MPD 8888 column below)
but slows down GPU rendering (see the non-MPD GPU column below). Since this is how
Chromium renders I propose switching to this regimen (even though it is "slowing down"
GPU rendering).

nanobench mean times (ms) with layer hoisting disabled (for desk_amazon.skp)

8888
                          MPD     non-MPD
1 canvas (old-style)     0.628    1.71
separate (new-style)     0.795    1.63

GPU
                          MPD     non-MPD
1 canvas (old-style)     2.34     1.69
separate (new-style)     2.32     2.66

Review URL: https://codereview.chromium.org/779643002
This commit is contained in:
robertphillips 2014-12-09 10:27:54 -08:00 committed by Commit bot
parent 43be354644
commit a3e52724ac
1 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
bench/SKPBench.cpp
View File

@ -40,10 +40,6 @@ const char* SKPBench::onGetUniqueName() {
}
void SKPBench::onPerCanvasPreDraw(SkCanvas* canvas) {
if (!fUseMultiPictureDraw) {
return;
}
SkIRect bounds;
SkAssertResult(canvas->getClipDeviceBounds(&bounds));
@ -74,10 +70,6 @@ void SKPBench::onPerCanvasPreDraw(SkCanvas* canvas) {
}
void SKPBench::onPerCanvasPostDraw(SkCanvas* canvas) {
if (!fUseMultiPictureDraw) {
return;
}
// Draw the last set of tiles into the master canvas in case we're
// saving the images
for (int i = 0; i < fTileRects.count(); ++i) {
@ -104,38 +96,31 @@ void SKPBench::onDraw(const int loops, SkCanvas* canvas) {
for (int i = 0; i < loops; i++) {
SkMultiPictureDraw mpd;
for (int i = 0; i < fTileRects.count(); ++i) {
for (int j = 0; j < fTileRects.count(); ++j) {
SkMatrix trans;
trans.setTranslate(-fTileRects[i].fLeft/fScale,
-fTileRects[i].fTop/fScale);
mpd.add(fSurfaces[i]->getCanvas(), fPic, &trans);
trans.setTranslate(-fTileRects[j].fLeft/fScale,
-fTileRects[j].fTop/fScale);
mpd.add(fSurfaces[j]->getCanvas(), fPic, &trans);
}
mpd.draw();
for (int i = 0; i < fTileRects.count(); ++i) {
fSurfaces[i]->getCanvas()->flush();
for (int j = 0; j < fTileRects.count(); ++j) {
fSurfaces[j]->getCanvas()->flush();
}
}
} else {
SkIRect bounds;
SkAssertResult(canvas->getClipDeviceBounds(&bounds));
SkAutoCanvasRestore overall(canvas, true/*save now*/);
canvas->scale(fScale, fScale);
for (int i = 0; i < loops; i++) {
for (int y = bounds.fTop; y < bounds.fBottom; y += FLAGS_benchTile) {
for (int x = bounds.fLeft; x < bounds.fRight; x += FLAGS_benchTile) {
SkAutoCanvasRestore perTile(canvas, true/*save now*/);
canvas->clipRect(SkRect::MakeXYWH(x/fScale, y/fScale,
FLAGS_benchTile/fScale,
FLAGS_benchTile/fScale));
fPic->playback(canvas);
}
for (int j = 0; j < fTileRects.count(); ++j) {
SkMatrix trans;
trans.setTranslate(-fTileRects[j].fLeft / fScale,
-fTileRects[j].fTop / fScale);
fSurfaces[j]->getCanvas()->drawPicture(fPic, &trans, NULL);
}
canvas->flush();
for (int j = 0; j < fTileRects.count(); ++j) {
fSurfaces[j]->getCanvas()->flush();
}
}
}
}