AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Address perf regression due adding GrRenderTargetContext::drawShape method

Browse Source 
All of the skps that regressed have maskFiltered DRRects that can be drawn as nested rects.
These used to go through the nested rect fast path and will again do so with this CL.

Change-Id: Ic787b89ffe71d2e9b20d394d5e0ce1a0ce135e98
Reviewed-on: https://skia-review.googlesource.com/148666
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2018-08-22 12:42:42 -04:00 committed by Skia Commit-Bot
parent 4283c03669
commit 73653b43dd
2 changed files with 61 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/gpu/GrRenderTargetContext.cpp
View File

@ -1436,53 +1436,6 @@ void GrRenderTargetContext::insertEventMarker(const SkString& str) {
this->getRTOpList()->addOp(std::move(op), *this->caps());
}
// Can 'path' be drawn as a pair of filled nested rectangles?
static bool fills_as_nested_rects(const SkMatrix& viewMatrix, const SkPath& path, SkRect rects[2]) {
if (path.isInverseFillType()) {
return false;
}
// TODO: this restriction could be lifted if we were willing to apply
// the matrix to all the points individually rather than just to the rect
if (!viewMatrix.rectStaysRect()) {
return false;
}
SkPath::Direction dirs[2];
if (!path.isNestedFillRects(rects, dirs)) {
return false;
}
if (SkPath::kWinding_FillType == path.getFillType() && dirs[0] == dirs[1]) {
// The two rects need to be wound opposite to each other
return false;
}
// Right now, nested rects where the margin is not the same width
// all around do not render correctly
const SkScalar* outer = rects[0].asScalars();
const SkScalar* inner = rects[1].asScalars();
bool allEq = true;
SkScalar margin = SkScalarAbs(outer[0] - inner[0]);
bool allGoE1 = margin >= SK_Scalar1;
for (int i = 1; i < 4; ++i) {
SkScalar temp = SkScalarAbs(outer[i] - inner[i]);
if (temp < SK_Scalar1) {
allGoE1 = false;
}
if (!SkScalarNearlyEqual(margin, temp)) {
allEq = false;
}
}
return allEq || allGoE1;
}
void GrRenderTargetContext::drawPath(const GrClip& clip,
GrPaint&& paint,
GrAA aa,
@ -1494,22 +1447,6 @@ void GrRenderTargetContext::drawPath(const GrClip& clip,
SkDEBUGCODE(this->validate();)
GR_CREATE_TRACE_MARKER_CONTEXT("GrRenderTargetContext", "drawPath", fContext);
GrAAType aaType = this->chooseAAType(aa, GrAllowMixedSamples::kNo);
if (GrAAType::kCoverage == aaType) {
// TODO: Make GrShape check for nested rects.
SkRect rects[2];
if (style.isSimpleFill() && fills_as_nested_rects(viewMatrix, path, rects)) {
// Concave AA paths are expensive - try to avoid them for special cases
std::unique_ptr<GrDrawOp> op = GrRectOpFactory::MakeAAFillNestedRects(
fContext, std::move(paint), viewMatrix, rects);
if (op) {
this->addDrawOp(clip, std::move(op));
}
// Returning here indicates that there is nothing to draw in this case.
return;
}
}
GrShape shape(path, style);
this->drawShape(clip, std::move(paint), aa, viewMatrix, shape);
@ -1535,6 +1472,7 @@ void GrRenderTargetContext::drawShape(const GrClip& clip,
AutoCheckFlush acf(this->drawingManager());
if (!shape.style().hasPathEffect()) {
GrAAType aaType = this->chooseAAType(aa, GrAllowMixedSamples::kNo);
SkRRect rrect;
// We can ignore the starting point and direction since there is no path effect.
bool inverted;
@ -1549,6 +1487,21 @@ void GrRenderTargetContext::drawShape(const GrClip& clip,
}
this->drawRRect(clip, std::move(paint), aa, viewMatrix, rrect, shape.style());
return;
} else if (GrAAType::kCoverage == aaType && shape.style().isSimpleFill() &&
viewMatrix.rectStaysRect()) {
// TODO: the rectStaysRect restriction could be lifted if we were willing to apply
// the matrix to all the points individually rather than just to the rect
SkRect rects[2];
if (shape.asNestedRects(rects)) {
// Concave AA paths are expensive - try to avoid them for special cases
std::unique_ptr<GrDrawOp> op = GrRectOpFactory::MakeAAFillNestedRects(
fContext, std::move(paint), viewMatrix, rects);
if (op) {
this->addDrawOp(clip, std::move(op));
}
// Returning here indicates that there is nothing to draw in this case.
return;
}
}
}

45
src/gpu/GrShape.h
View File

@ -243,6 +243,51 @@ public:
}
}
// Can this shape be drawn as a pair of filled nested rectangles?
bool asNestedRects(SkRect rects[2]) const {
if (Type::kPath != fType) {
return false;
}
// TODO: it would be better two store DRRects natively in the shape rather than converting
// them to a path and then reextracting the nested rects
if (this->path().isInverseFillType()) {
return false;
}
SkPath::Direction dirs[2];
if (!this->path().isNestedFillRects(rects, dirs)) {
return false;
}
if (SkPath::kWinding_FillType == this->path().getFillType() && dirs[0] == dirs[1]) {
// The two rects need to be wound opposite to each other
return false;
}
// Right now, nested rects where the margin is not the same width
// all around do not render correctly
const SkScalar* outer = rects[0].asScalars();
const SkScalar* inner = rects[1].asScalars();
bool allEq = true;
SkScalar margin = SkScalarAbs(outer[0] - inner[0]);
bool allGoE1 = margin >= SK_Scalar1;
for (int i = 1; i < 4; ++i) {
SkScalar temp = SkScalarAbs(outer[i] - inner[i]);
if (temp < SK_Scalar1) {
allGoE1 = false;
}
if (!SkScalarNearlyEqual(margin, temp)) {
allEq = false;
}
}
return allEq || allGoE1;
}
/**
* Returns whether the geometry is empty. Note that applying the style could produce a
* non-empty shape. It also may have an inverse fill.