4431e7757c
Mike K: please sanity check Test.cpp and skia_test.cpp Feel free to look at the rest, but I don't expect any in depth review of path ops innards. Path Ops first iteration used QuickSort to order segments radiating from an intersection to compute the winding rule. This revision uses a circular sort instead. Breaking out the circular sort into its own long-lived structure (SkOpAngle) allows doing less work and provides a home for caching additional sorting data. The circle sort is more stable than the former sort, has a robust ordering and fewer exceptions. It finds unsortable ordering less often. It is less reliant on the initial curve tangent, using convex hulls instead whenever it can. Additional debug validation makes sure that the computed structures are self-consistent. A new visualization tool helps verify that the angle ordering is correct. The 70+M tests pass with this change on Windows, Mac, Linux 32 and Linux 64 in debug and release. R=mtklein@google.com, reed@google.com Author: caryclark@google.com Review URL: https://codereview.chromium.org/131103009 git-svn-id: http://skia.googlecode.com/svn/trunk@14183 2bbb7eff-a529-9590-31e7-b0007b416f81
130 lines
3.2 KiB
C++
130 lines
3.2 KiB
C++
|
|
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "Test.h"
|
|
|
|
#include "SkCommandLineFlags.h"
|
|
#include "SkError.h"
|
|
#include "SkString.h"
|
|
#include "SkTArray.h"
|
|
#include "SkTime.h"
|
|
|
|
#if SK_SUPPORT_GPU
|
|
#include "GrContext.h"
|
|
#include "gl/SkNativeGLContext.h"
|
|
#else
|
|
class GrContext;
|
|
#endif
|
|
|
|
DEFINE_string2(tmpDir, t, NULL, "tmp directory for tests to use.");
|
|
|
|
using namespace skiatest;
|
|
|
|
Reporter::Reporter() : fTestCount(0) {
|
|
}
|
|
|
|
void Reporter::startTest(Test* test) {
|
|
this->onStart(test);
|
|
}
|
|
|
|
void Reporter::reportFailed(const SkString& desc) {
|
|
this->onReportFailed(desc);
|
|
}
|
|
|
|
void Reporter::endTest(Test* test) {
|
|
this->onEnd(test);
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
Test::Test() : fReporter(NULL), fPassed(true) {}
|
|
|
|
Test::~Test() {
|
|
SkSafeUnref(fReporter);
|
|
}
|
|
|
|
void Test::setReporter(Reporter* r) {
|
|
SkRefCnt_SafeAssign(fReporter, r);
|
|
}
|
|
|
|
const char* Test::getName() {
|
|
if (fName.size() == 0) {
|
|
this->onGetName(&fName);
|
|
}
|
|
return fName.c_str();
|
|
}
|
|
|
|
class LocalReporter : public Reporter {
|
|
public:
|
|
explicit LocalReporter(Reporter* reporterToMimic) : fReporter(reporterToMimic) {}
|
|
|
|
int numFailures() const { return fFailures.count(); }
|
|
const SkString& failure(int i) const { return fFailures[i]; }
|
|
|
|
protected:
|
|
virtual void onReportFailed(const SkString& desc) SK_OVERRIDE {
|
|
fFailures.push_back(desc);
|
|
}
|
|
|
|
// Proxy down to fReporter. We assume these calls are threadsafe.
|
|
virtual bool allowExtendedTest() const SK_OVERRIDE {
|
|
return fReporter->allowExtendedTest();
|
|
}
|
|
|
|
virtual bool allowThreaded() const SK_OVERRIDE {
|
|
return fReporter->allowThreaded();
|
|
}
|
|
|
|
virtual void bumpTestCount() SK_OVERRIDE {
|
|
fReporter->bumpTestCount();
|
|
}
|
|
|
|
virtual bool verbose() const SK_OVERRIDE {
|
|
return fReporter->verbose();
|
|
}
|
|
|
|
private:
|
|
Reporter* fReporter; // Unowned.
|
|
SkTArray<SkString> fFailures;
|
|
};
|
|
|
|
void Test::run() {
|
|
// Clear the Skia error callback before running any test, to ensure that tests
|
|
// don't have unintended side effects when running more than one.
|
|
SkSetErrorCallback( NULL, NULL );
|
|
|
|
// Tell (likely shared) fReporter that this test has started.
|
|
fReporter->startTest(this);
|
|
|
|
const SkMSec start = SkTime::GetMSecs();
|
|
// Run the test into a LocalReporter so we know if it's passed or failed without interference
|
|
// from other tests that might share fReporter.
|
|
LocalReporter local(fReporter);
|
|
this->onRun(&local);
|
|
fPassed = local.numFailures() == 0;
|
|
fElapsed = SkTime::GetMSecs() - start;
|
|
|
|
// Now tell fReporter about any failures and wrap up.
|
|
for (int i = 0; i < local.numFailures(); i++) {
|
|
fReporter->reportFailed(local.failure(i));
|
|
}
|
|
fReporter->endTest(this);
|
|
|
|
}
|
|
|
|
SkString Test::GetTmpDir() {
|
|
const char* tmpDir = FLAGS_tmpDir.isEmpty() ? NULL : FLAGS_tmpDir[0];
|
|
return SkString(tmpDir);
|
|
}
|
|
|
|
static const char* gResourcePath = NULL;
|
|
void Test::SetResourcePath(const char* resourcePath) { gResourcePath = resourcePath; }
|
|
|
|
SkString Test::GetResourcePath() {
|
|
return SkString(gResourcePath);
|
|
}
|