diff options
author | mtklein <mtklein@chromium.org> | 2014-10-29 14:17:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-29 14:17:13 -0700 |
commit | e71cd54ed4d83310d718490d40643c35b622b9f5 (patch) | |
tree | 121583f7bf0092c4d082bc6f50c789ceff8bef96 /dm | |
parent | 6838d854a87e79f1fbb7b89b9f395155ad44dc0a (diff) |
SkTaskGroup::batch(fn, args, N)
Porting QuiltTask isn't important in itself; this is mostly an API feeler.
BUG=skia:
Review URL: https://codereview.chromium.org/689673003
Diffstat (limited to 'dm')
-rw-r--r-- | dm/DMQuiltTask.cpp | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/dm/DMQuiltTask.cpp b/dm/DMQuiltTask.cpp index 3d7daf27eb..92bb6110ac 100644 --- a/dm/DMQuiltTask.cpp +++ b/dm/DMQuiltTask.cpp @@ -25,32 +25,22 @@ static int tiles_needed(int fullDimension, int tileDimension) { return (fullDimension + tileDimension - 1) / tileDimension; } -class Tile : public SkRunnable { -public: - Tile(int x, int y, const SkPicture& picture, SkBitmap* quilt) - : fX(x * FLAGS_quiltTile) - , fY(y * FLAGS_quiltTile) - , fPicture(picture) - , fQuilt(quilt) {} - - virtual void run() SK_OVERRIDE { - SkBitmap tile; - fQuilt->extractSubset(&tile, SkIRect::MakeXYWH(fX, fY, FLAGS_quiltTile, FLAGS_quiltTile)); - SkCanvas tileCanvas(tile); - - tileCanvas.translate(SkIntToScalar(-fX), SkIntToScalar(-fY)); - fPicture.playback(&tileCanvas); - tileCanvas.flush(); - - delete this; - } - -private: - const int fX, fY; - const SkPicture& fPicture; - SkBitmap* fQuilt; +struct DrawTileArgs { + int x, y; + const SkPicture* picture; + SkBitmap* quilt; }; +static void draw_tile(DrawTileArgs* arg) { + const DrawTileArgs& a = *arg; + SkBitmap tile; + a.quilt->extractSubset(&tile, SkIRect::MakeXYWH(a.x, a.y, FLAGS_quiltTile, FLAGS_quiltTile)); + SkCanvas tileCanvas(tile); + tileCanvas.translate(SkIntToScalar(-a.x), SkIntToScalar(-a.y)); + a.picture->playback(&tileCanvas); + tileCanvas.flush(); +} + void QuiltTask::draw() { SkAutoTDelete<SkBBHFactory> factory; switch (fBBH) { @@ -88,13 +78,17 @@ void QuiltTask::draw() { canvas.flush(); } else { // Draw tiles in parallel into the same bitmap, simulating aggressive impl-side painting. - SkTaskGroup tg; - for (int y = 0; y < tiles_needed(full.height(), FLAGS_quiltTile); y++) { - for (int x = 0; x < tiles_needed(full.width(), FLAGS_quiltTile); x++) { - // Deletes itself when done. - tg.add(new Tile(x, y, *recorded, &full)); + int xTiles = tiles_needed(full.width(), FLAGS_quiltTile), + yTiles = tiles_needed(full.height(), FLAGS_quiltTile); + SkTDArray<DrawTileArgs> args; + args.setCount(xTiles*yTiles); + for (int y = 0; y < yTiles; y++) { + for (int x = 0; x < xTiles; x++) { + DrawTileArgs arg = { x*FLAGS_quiltTile, y*FLAGS_quiltTile, recorded, &full }; + args[y*xTiles + x] = arg; } } + SkTaskGroup().batch(draw_tile, args.begin(), args.count()); } if (!BitmapsEqual(full, fReference)) { |