7cdc1ee115
Now that we're drawing tiles threaded like implside painting, remove the checks that those lock counts are balanced. They're just not right for anyone anymore. SkBitmaps themselves are not threadsafe (even const ones), so shallow copy them on playback of an SkRecord. (The underlying SkPixelRefs are threadsafe.) Simplify quilt drawing by using SkBitmap::extractSubset. No need for locking. Bump up to 256x256 tiles. 16x16 tiles just murders performance (way too much contention). This has the nice side effect of letting us enable a bunch more GMs for quilt mode; they drew wrong with small tiles but exactly right with large. BUG=171776 R=reed@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/371023005
395 lines
12 KiB
C++
395 lines
12 KiB
C++
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm.h"
|
|
#include "SkBlurMask.h"
|
|
#include "SkBlurMaskFilter.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkPath.h"
|
|
|
|
#define STROKE_WIDTH SkIntToScalar(10)
|
|
|
|
typedef void (*Proc)(SkCanvas*, const SkRect&, const SkPaint&);
|
|
|
|
static void fill_rect(SkCanvas* canvas, const SkRect& r, const SkPaint& p) {
|
|
canvas->drawRect(r, p);
|
|
}
|
|
|
|
static void draw_donut(SkCanvas* canvas, const SkRect& r, const SkPaint& p) {
|
|
SkRect rect;
|
|
SkPath path;
|
|
|
|
rect = r;
|
|
rect.outset(STROKE_WIDTH/2, STROKE_WIDTH/2);
|
|
path.addRect(rect);
|
|
rect = r;
|
|
rect.inset(STROKE_WIDTH/2, STROKE_WIDTH/2);
|
|
|
|
path.addRect(rect);
|
|
path.setFillType(SkPath::kEvenOdd_FillType);
|
|
|
|
canvas->drawPath(path, p);
|
|
}
|
|
|
|
static void draw_donut_skewed(SkCanvas* canvas, const SkRect& r, const SkPaint& p) {
|
|
SkRect rect;
|
|
SkPath path;
|
|
|
|
rect = r;
|
|
rect.outset(STROKE_WIDTH/2, STROKE_WIDTH/2);
|
|
path.addRect(rect);
|
|
rect = r;
|
|
rect.inset(STROKE_WIDTH/2, STROKE_WIDTH/2);
|
|
|
|
rect.offset(7, -7);
|
|
|
|
path.addRect(rect);
|
|
path.setFillType(SkPath::kEvenOdd_FillType);
|
|
|
|
canvas->drawPath(path, p);
|
|
}
|
|
|
|
#include "SkGradientShader.h"
|
|
|
|
typedef void (*PaintProc)(SkPaint*, SkScalar width);
|
|
|
|
class BlurRectGM : public skiagm::GM {
|
|
SkAutoTUnref<SkMaskFilter> fMaskFilters[kLastEnum_SkBlurStyle + 1];
|
|
SkString fName;
|
|
SkAlpha fAlpha;
|
|
public:
|
|
BlurRectGM(const char name[], U8CPU alpha)
|
|
: fName(name)
|
|
, fAlpha(SkToU8(alpha)) {
|
|
}
|
|
|
|
protected:
|
|
virtual void onOnceBeforeDraw() SK_OVERRIDE {
|
|
for (int i = 0; i <= kLastEnum_SkBlurStyle; ++i) {
|
|
fMaskFilters[i].reset(SkBlurMaskFilter::Create((SkBlurStyle)i,
|
|
SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(STROKE_WIDTH/2)),
|
|
SkBlurMaskFilter::kHighQuality_BlurFlag));
|
|
}
|
|
}
|
|
|
|
virtual SkString onShortName() {
|
|
return fName;
|
|
}
|
|
|
|
virtual SkISize onISize() {
|
|
return SkISize::Make(440, 820);
|
|
}
|
|
|
|
virtual void onDraw(SkCanvas* canvas) {
|
|
canvas->translate(STROKE_WIDTH*3/2, STROKE_WIDTH*3/2);
|
|
|
|
SkRect r = { 0, 0, 100, 50 };
|
|
SkScalar scales[] = { SK_Scalar1, 0.6f };
|
|
|
|
for (size_t s = 0; s < SK_ARRAY_COUNT(scales); ++s) {
|
|
canvas->save();
|
|
for (size_t f = 0; f < SK_ARRAY_COUNT(fMaskFilters); ++f) {
|
|
SkPaint paint;
|
|
paint.setMaskFilter(fMaskFilters[f]);
|
|
paint.setAlpha(fAlpha);
|
|
|
|
static const Proc procs[] = {
|
|
fill_rect, draw_donut, draw_donut_skewed
|
|
};
|
|
|
|
canvas->save();
|
|
canvas->scale(scales[s], scales[s]);
|
|
this->drawProcs(canvas, r, paint, false, procs, SK_ARRAY_COUNT(procs));
|
|
canvas->translate(r.width() * 4/3, 0);
|
|
this->drawProcs(canvas, r, paint, true, procs, SK_ARRAY_COUNT(procs));
|
|
canvas->restore();
|
|
|
|
canvas->translate(0, SK_ARRAY_COUNT(procs) * r.height() * 4/3 * scales[s]);
|
|
}
|
|
canvas->restore();
|
|
canvas->translate(2 * r.width() * 4/3 * scales[s], 0);
|
|
}
|
|
}
|
|
|
|
virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; }
|
|
|
|
private:
|
|
void drawProcs(SkCanvas* canvas, const SkRect& r, const SkPaint& paint,
|
|
bool doClip, const Proc procs[], size_t procsCount) {
|
|
SkAutoCanvasRestore acr(canvas, true);
|
|
for (size_t i = 0; i < procsCount; ++i) {
|
|
if (doClip) {
|
|
SkRect clipRect(r);
|
|
clipRect.inset(STROKE_WIDTH/2, STROKE_WIDTH/2);
|
|
canvas->save();
|
|
canvas->clipRect(r);
|
|
}
|
|
procs[i](canvas, r, paint);
|
|
if (doClip) {
|
|
canvas->restore();
|
|
}
|
|
canvas->translate(0, r.height() * 4/3);
|
|
}
|
|
}
|
|
private:
|
|
typedef GM INHERITED;
|
|
};
|
|
|
|
|
|
class BlurRectDirectGM : public skiagm::GM {
|
|
SkString fName;
|
|
int fGMWidth, fGMHeight;
|
|
int fPadding, fMargin;
|
|
public:
|
|
BlurRectDirectGM(const char name[])
|
|
: fName(name),
|
|
fGMWidth(1200),
|
|
fGMHeight(1024),
|
|
fPadding(10),
|
|
fMargin(100)
|
|
{
|
|
}
|
|
|
|
protected:
|
|
virtual SkString onShortName() {
|
|
return fName;
|
|
}
|
|
|
|
virtual SkISize onISize() {
|
|
return SkISize::Make(fGMWidth, fGMHeight);
|
|
}
|
|
|
|
virtual void onDraw(SkCanvas* canvas) {
|
|
const int widths[] = {25, 5, 5, 100, 150, 25};
|
|
const int heights[] = {100, 100, 5, 25, 150, 25};
|
|
const SkBlurStyle styles[] = {kNormal_SkBlurStyle, kInner_SkBlurStyle, kOuter_SkBlurStyle};
|
|
const float radii[] = {20, 5, 10};
|
|
|
|
canvas->translate(50,20);
|
|
|
|
int cur_x = 0;
|
|
int cur_y = 0;
|
|
|
|
int max_height = 0;
|
|
|
|
for (size_t i = 0 ; i < SK_ARRAY_COUNT(widths) ; i++) {
|
|
int width = widths[i];
|
|
int height = heights[i];
|
|
SkRect r;
|
|
r.setWH(SkIntToScalar(width), SkIntToScalar(height));
|
|
SkAutoCanvasRestore autoRestore(canvas, true);
|
|
|
|
for (size_t j = 0 ; j < SK_ARRAY_COUNT(radii) ; j++) {
|
|
float radius = radii[j];
|
|
for (size_t k = 0 ; k < SK_ARRAY_COUNT(styles) ; k++) {
|
|
SkBlurStyle style = styles[k];
|
|
|
|
SkMask mask;
|
|
SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(radius), &mask, r, style);
|
|
|
|
SkAutoMaskFreeImage amfi(mask.fImage);
|
|
|
|
SkBitmap bm;
|
|
bm.installMaskPixels(mask);
|
|
|
|
if (cur_x + bm.width() >= fGMWidth - fMargin) {
|
|
cur_x = 0;
|
|
cur_y += max_height + fPadding;
|
|
max_height = 0;
|
|
}
|
|
|
|
canvas->save();
|
|
canvas->translate((SkScalar)cur_x, (SkScalar)cur_y);
|
|
canvas->translate(-(bm.width() - r.width())/2, -(bm.height()-r.height())/2);
|
|
canvas->drawBitmap(bm, 0.f, 0.f, NULL);
|
|
canvas->restore();
|
|
|
|
cur_x += bm.width() + fPadding;
|
|
if (bm.height() > max_height)
|
|
max_height = bm.height();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; }
|
|
|
|
private:
|
|
typedef GM INHERITED;
|
|
};
|
|
|
|
class BlurRectCompareGM : public skiagm::GM {
|
|
SkString fName;
|
|
unsigned int fRectWidth, fRectHeight;
|
|
SkScalar fRadius;
|
|
SkBlurStyle fStyle;
|
|
public:
|
|
BlurRectCompareGM(const char name[], unsigned int rectWidth,
|
|
unsigned int rectHeight, float radius,
|
|
SkBlurStyle style)
|
|
: fName(name)
|
|
, fRectWidth(rectWidth)
|
|
, fRectHeight(rectHeight)
|
|
, fRadius(radius)
|
|
, fStyle(style) {
|
|
}
|
|
int width() const {
|
|
return fRectWidth;
|
|
}
|
|
int height() const {
|
|
return fRectHeight;
|
|
}
|
|
SkScalar radius() const {
|
|
return fRadius;
|
|
}
|
|
SkBlurStyle style() const {
|
|
return fStyle;
|
|
}
|
|
|
|
protected:
|
|
virtual SkString onShortName() {
|
|
return fName;
|
|
}
|
|
|
|
virtual SkISize onISize() {
|
|
return SkISize::Make(640, 480);
|
|
}
|
|
|
|
virtual bool makeMask(SkMask *m, const SkRect&) = 0;
|
|
|
|
virtual void onDraw(SkCanvas* canvas) {
|
|
SkRect r;
|
|
r.setWH(SkIntToScalar(fRectWidth), SkIntToScalar(fRectHeight));
|
|
|
|
SkISize canvas_size = canvas->getDeviceSize();
|
|
int center_x = (canvas_size.fWidth - (int)(r.width()))/2;
|
|
int center_y = (canvas_size.fHeight - (int)(r.height()))/2;
|
|
|
|
SkMask mask;
|
|
|
|
if (!this->makeMask(&mask, r)) {
|
|
SkPaint paint;
|
|
r.offset( SkIntToScalar(center_x), SkIntToScalar(center_y) );
|
|
canvas->drawRect(r,paint);
|
|
return;
|
|
}
|
|
SkAutoMaskFreeImage amfi(mask.fImage);
|
|
|
|
SkBitmap bm;
|
|
bm.installMaskPixels(mask);
|
|
|
|
center_x = (canvas_size.fWidth - mask.fBounds.width())/2;
|
|
center_y = (canvas_size.fHeight - mask.fBounds.height())/2;
|
|
|
|
canvas->drawBitmap(bm, SkIntToScalar(center_x), SkIntToScalar(center_y), NULL);
|
|
}
|
|
|
|
virtual uint32_t onGetFlags() const { return kSkipPipe_Flag; }
|
|
|
|
private:
|
|
typedef GM INHERITED;
|
|
};
|
|
|
|
class BlurRectFastGM: public BlurRectCompareGM {
|
|
public:
|
|
BlurRectFastGM(const char name[], unsigned int rectWidth,
|
|
unsigned int rectHeight, float blurRadius,
|
|
SkBlurStyle style) :
|
|
INHERITED(name, rectWidth, rectHeight, blurRadius, style) {
|
|
}
|
|
|
|
protected:
|
|
virtual bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE {
|
|
return SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()),
|
|
m, r, this->style());
|
|
}
|
|
private:
|
|
typedef BlurRectCompareGM INHERITED;
|
|
};
|
|
|
|
class BlurRectSlowGM: public BlurRectCompareGM {
|
|
public:
|
|
BlurRectSlowGM(const char name[], unsigned int rectWidth, unsigned int rectHeight,
|
|
float blurRadius, SkBlurStyle style)
|
|
: INHERITED(name, rectWidth, rectHeight, blurRadius, style) {
|
|
}
|
|
|
|
protected:
|
|
virtual bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE {
|
|
SkMask src;
|
|
r.roundOut(&src.fBounds);
|
|
src.fBounds.offset(-src.fBounds.fLeft, -src.fBounds.fTop); // move to origin
|
|
src.fFormat = SkMask::kA8_Format;
|
|
src.fRowBytes = src.fBounds.width();
|
|
src.fImage = SkMask::AllocImage(src.computeTotalImageSize());
|
|
SkAutoMaskFreeImage amfi(src.fImage);
|
|
|
|
memset(src.fImage, 0xff, src.computeTotalImageSize());
|
|
|
|
return SkBlurMask::BoxBlur(m, src,
|
|
SkBlurMask::ConvertRadiusToSigma(this->radius()),
|
|
this->style(), this->getQuality());
|
|
}
|
|
|
|
virtual SkBlurQuality getQuality() {
|
|
return kHigh_SkBlurQuality;
|
|
}
|
|
private:
|
|
typedef BlurRectCompareGM INHERITED;
|
|
};
|
|
|
|
class BlurRectSlowLowGM: public BlurRectSlowGM {
|
|
public:
|
|
BlurRectSlowLowGM(const char name[], unsigned int rectWidth, unsigned int rectHeight,
|
|
float blurRadius, SkBlurStyle style)
|
|
: INHERITED(name, rectWidth, rectHeight, blurRadius, style) {
|
|
}
|
|
|
|
protected:
|
|
virtual SkBlurQuality getQuality() SK_OVERRIDE {
|
|
return kLow_SkBlurQuality;
|
|
}
|
|
private:
|
|
typedef BlurRectSlowGM INHERITED;
|
|
};
|
|
|
|
class BlurRectGroundTruthGM: public BlurRectCompareGM {
|
|
public:
|
|
BlurRectGroundTruthGM(const char name[], unsigned int rectWidth, unsigned int rectHeight,
|
|
float blurRadius, SkBlurStyle style)
|
|
: INHERITED(name, rectWidth, rectHeight, blurRadius, style) {
|
|
}
|
|
|
|
protected:
|
|
virtual bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE {
|
|
SkMask src;
|
|
r.roundOut(&src.fBounds);
|
|
src.fBounds.offset(-src.fBounds.fLeft, -src.fBounds.fTop); // move to origin
|
|
src.fFormat = SkMask::kA8_Format;
|
|
src.fRowBytes = src.fBounds.width();
|
|
src.fImage = SkMask::AllocImage(src.computeTotalImageSize());
|
|
SkAutoMaskFreeImage amfi(src.fImage);
|
|
|
|
memset(src.fImage, 0xff, src.computeTotalImageSize());
|
|
|
|
return SkBlurMask::BlurGroundTruth(SkBlurMask::ConvertRadiusToSigma(this->radius()),
|
|
m, src, this->style());
|
|
}
|
|
|
|
virtual SkBlurQuality getQuality() {
|
|
return kHigh_SkBlurQuality;
|
|
}
|
|
private:
|
|
typedef BlurRectCompareGM INHERITED;
|
|
};
|
|
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
DEF_GM(return new BlurRectGM("blurrects", 0xFF);)
|
|
DEF_GM(return new BlurRectDirectGM("blurrect_gallery");)
|