Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(142)

Unified Diff: dm/DMQuiltTask.cpp

Issue 788243008: Sketch DM refactor. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: better failure messages, disable a few things temporarily to try to go green Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dm/DMQuiltTask.h ('k') | dm/DMReporter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dm/DMQuiltTask.cpp
diff --git a/dm/DMQuiltTask.cpp b/dm/DMQuiltTask.cpp
deleted file mode 100644
index 83a989da718907cf5e070db719346bebadd641a4..0000000000000000000000000000000000000000
--- a/dm/DMQuiltTask.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "DMQuiltTask.h"
-#include "DMUtil.h"
-#include "DMWriteTask.h"
-
-#include "SkBBHFactory.h"
-#include "SkCommandLineFlags.h"
-#include "SkPicture.h"
-#include "SkTaskGroup.h"
-
-DEFINE_bool(quilt, true, "If true, draw GM via a picture into a quilt of small tiles and compare.");
-DEFINE_int32(quiltTile, 256, "Dimension of (square) quilt tile.");
-
-namespace DM {
-
-static const char* kBBHs[] = { "nobbh", "rtree", "tilegrid" };
-QuiltTask::QuiltTask(const Task& parent, skiagm::GM* gm, SkBitmap reference, QuiltTask::BBH bbh)
- : CpuTask(parent)
- , fBBH(bbh)
- , fName(UnderJoin(parent.name().c_str(), kBBHs[bbh]))
- , fGM(gm)
- , fReference(reference)
- {}
-
-static int tiles_needed(int fullDimension, int tileDimension) {
- return (fullDimension + tileDimension - 1) / tileDimension;
-}
-
-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) {
- case kNone_BBH: break;
- case kRTree_BBH:
- factory.reset(SkNEW(SkRTreeFactory));
- break;
- }
-
- // A couple GMs draw wrong when using a bounding box hierarchy.
- // This almost certainly means we have a bug to fix, but for now
- // just draw without a bounding box hierarchy.
- if (fGM->getFlags() & skiagm::GM::kNoBBH_Flag) {
- factory.reset(NULL);
- }
-
- SkAutoTUnref<const SkPicture> recorded(RecordPicture(fGM.get(), factory.get()));
-
- SkBitmap full;
- AllocatePixels(fReference, &full);
-
- if (fGM->getFlags() & skiagm::GM::kSkipTiled_Flag) {
- // Some GMs don't draw exactly the same when tiled. Draw them in one go.
- SkCanvas canvas(full);
- recorded->playback(&canvas);
- canvas.flush();
- } else {
- // Draw tiles in parallel into the same bitmap, simulating aggressive impl-side painting.
- 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)) {
- this->fail();
- this->spawnChild(SkNEW_ARGS(WriteTask, (*this, "GM", full)));
- }
-}
-
-bool QuiltTask::shouldSkip() const {
- if (fGM->getFlags() & skiagm::GM::kSkipPicture_Flag) {
- return true;
- }
- return !FLAGS_quilt;
-}
-
-} // namespace DM
« no previous file with comments | « dm/DMQuiltTask.h ('k') | dm/DMReporter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698