99589af4e3
DM writes out its images in a hierarchy that's a little different than GM, so this can't read GM's output. But it can read its own, written with -w. Example usage: $ out/Release/dm -w /tmp/baseline $ out/Release/dm -r /tmp/baseline -w /tmp/new (and optionally) $ mkdir /tmp/diff; out/Release/skdiff /tmp/baseline /tmp/new /tmp/diff GM's IndividualImageExpectationsSource and Expectations are a little too eager about decoding and hashing the expected images, so I took the opportunity to add DM::Expectations that mostly replaces skiagm::ExpectationsSource and skiagm::Expectations in DM. It mainly exists to move the image decoding and comparison off the main thread, which would otherwise be a major speed bottleneck. I tried to use skiagm code where possible. One notable place where I differed is in this new feature. When -r is a directory of images, DM does no hashing. It considerably faster to read the expected file into an SkBitmap and do a byte-for-byte comparison than to hash the two bitmaps and check those. The example usage above isn't quite working 100% yet. Expectations on some GMs fail, even with no binary change. I haven't pinned down whether this is due to - a bug in DM - flaky GMs - unthreadsafe GMs - flaky image decoding - unthreadsafe image decoding - something else but I intend to. Leon, Derek and I have suspected PNG decoding isn't threadsafe, but are as yet unable to prove it. I also seem to be able to cause malloc to fail on my laptop if I run too many configs at once, though I never seem to be using more than ~1G of RAM. Will track that down too. BUG= R=reed@google.com, bsalomon@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/108963002 git-svn-id: http://skia.googlecode.com/svn/trunk@12596 2bbb7eff-a529-9590-31e7-b0007b416f81
72 lines
2.1 KiB
C++
72 lines
2.1 KiB
C++
#include "DMGpuTask.h"
|
|
|
|
#include "DMExpectationsTask.h"
|
|
#include "DMUtil.h"
|
|
#include "DMWriteTask.h"
|
|
#include "SkCommandLineFlags.h"
|
|
#include "SkGpuDevice.h"
|
|
#include "SkTLS.h"
|
|
|
|
namespace DM {
|
|
|
|
GpuTask::GpuTask(const char* name,
|
|
Reporter* reporter,
|
|
TaskRunner* taskRunner,
|
|
const Expectations& expectations,
|
|
skiagm::GMRegistry::Factory gmFactory,
|
|
SkBitmap::Config config,
|
|
GrContextFactory::GLContextType contextType,
|
|
int sampleCount)
|
|
: Task(reporter, taskRunner)
|
|
, fGM(gmFactory(NULL))
|
|
, fName(UnderJoin(fGM->shortName(), name))
|
|
, fExpectations(expectations)
|
|
, fConfig(config)
|
|
, fContextType(contextType)
|
|
, fSampleCount(sampleCount)
|
|
{}
|
|
|
|
static void* new_gr_context_factory() {
|
|
return SkNEW(GrContextFactory);
|
|
}
|
|
|
|
static void delete_gr_context_factory(void* factory) {
|
|
SkDELETE((GrContextFactory*) factory);
|
|
}
|
|
|
|
static GrContextFactory* get_gr_factory() {
|
|
return reinterpret_cast<GrContextFactory*>(SkTLS::Get(&new_gr_context_factory,
|
|
&delete_gr_context_factory));
|
|
}
|
|
|
|
void GpuTask::draw() {
|
|
GrContext* gr = get_gr_factory()->get(fContextType); // Will be owned by device.
|
|
SkGpuDevice device(gr,
|
|
fConfig,
|
|
SkScalarCeilToInt(fGM->width()),
|
|
SkScalarCeilToInt(fGM->height()),
|
|
fSampleCount);
|
|
SkCanvas canvas(&device);
|
|
|
|
canvas.concat(fGM->getInitialTransform());
|
|
fGM->draw(&canvas);
|
|
canvas.flush();
|
|
|
|
SkBitmap bitmap;
|
|
bitmap.setConfig(fConfig, SkScalarCeilToInt(fGM->width()), SkScalarCeilToInt(fGM->height()));
|
|
canvas.readPixels(&bitmap, 0, 0);
|
|
|
|
#if GR_CACHE_STATS
|
|
gr->printCacheStats();
|
|
#endif
|
|
|
|
this->spawnChild(SkNEW_ARGS(ExpectationsTask, (*this, fExpectations, bitmap)));
|
|
this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap)));
|
|
}
|
|
|
|
bool GpuTask::shouldSkip() const {
|
|
return SkToBool(fGM->getFlags() & skiagm::GM::kSkipGPU_Flag);
|
|
}
|
|
|
|
} // namespace DM
|