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

Add drawRRect and drawShape(GrShape) to GrSWMaskHelper

Browse Source 
Change-Id: I68d586b44f3207c330e5c0505659457c9d05074e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/287384
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
This commit is contained in:
Michael Ludwig 2020-05-04 14:51:43 -04:00 committed by Skia Commit-Bot
parent 40c683a24a
commit 4fc7c5f36a
3 changed files with 69 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gpu/GrClipStackClip.cpp
View File

@ -450,8 +450,7 @@ static void draw_clip_elements_to_mask_helper(GrSWMaskHelper& helper, const Elem
SkPath clipPath;
element->asDeviceSpacePath(&clipPath);
clipPath.toggleInverseFillType();
GrStyledShape shape(clipPath, GrStyle::SimpleFill());
helper.drawShape(shape, translate, SkRegion::kReplace_Op, aa, 0x00);
helper.drawShape(GrShape(clipPath), translate, SkRegion::kReplace_Op, aa, 0x00);
continue;
}
@ -459,11 +458,12 @@ static void draw_clip_elements_to_mask_helper(GrSWMaskHelper& helper, const Elem
// the geometry so they can just be drawn normally
if (Element::DeviceSpaceType::kRect == element->getDeviceSpaceType()) {
helper.drawRect(element->getDeviceSpaceRect(), translate, (SkRegion::Op)op, aa, 0xFF);
} else if (Element::DeviceSpaceType::kRRect == element->getDeviceSpaceType()) {
helper.drawRRect(element->getDeviceSpaceRRect(), translate, (SkRegion::Op)op, aa, 0xFF);
} else {
SkPath path;
element->asDeviceSpacePath(&path);
GrStyledShape shape(path, GrStyle::SimpleFill());
helper.drawShape(shape, translate, (SkRegion::Op)op, aa, 0xFF);
helper.drawShape(GrShape(path), translate, (SkRegion::Op)op, aa, 0xFF);
}
}
}

69
src/gpu/GrSWMaskHelper.cpp
View File

@ -33,21 +33,34 @@ static SkBlendMode op_to_mode(SkRegion::Op op) {
return modeMap[op];
}
static SkPaint get_paint(SkRegion::Op op, GrAA aa, uint8_t alpha) {
SkPaint paint;
paint.setBlendMode(op_to_mode(op));
paint.setAntiAlias(GrAA::kYes == aa);
// SkPaint's color is unpremul so this will produce alpha in every channel.
paint.setColor(SkColorSetARGB(alpha, 255, 255, 255));
return paint;
}
/**
* Draw a single rect element of the clip stack into the accumulation bitmap
*/
void GrSWMaskHelper::drawRect(const SkRect& rect, const SkMatrix& matrix, SkRegion::Op op, GrAA aa,
uint8_t alpha) {
SkPaint paint;
paint.setBlendMode(op_to_mode(op));
paint.setAntiAlias(GrAA::kYes == aa);
paint.setColor(SkColorSetARGB(alpha, alpha, alpha, alpha));
SkMatrix translatedMatrix = matrix;
translatedMatrix.postTranslate(fTranslate.fX, fTranslate.fY);
fDraw.fMatrix = &translatedMatrix;
fDraw.drawRect(rect, paint);
fDraw.drawRect(rect, get_paint(op, aa, alpha));
}
void GrSWMaskHelper::drawRRect(const SkRRect& rrect, const SkMatrix& matrix, SkRegion::Op op,
GrAA aa, uint8_t alpha) {
SkMatrix translatedMatrix = matrix;
translatedMatrix.postTranslate(fTranslate.fX, fTranslate.fY);
fDraw.fMatrix = &translatedMatrix;
fDraw.drawRRect(rrect, get_paint(op, aa, alpha));
}
/**
@ -55,10 +68,9 @@ void GrSWMaskHelper::drawRect(const SkRect& rect, const SkMatrix& matrix, SkRegi
*/
void GrSWMaskHelper::drawShape(const GrStyledShape& shape, const SkMatrix& matrix, SkRegion::Op op,
GrAA aa, uint8_t alpha) {
SkPaint paint;
SkPaint paint = get_paint(op, aa, alpha);
paint.setPathEffect(shape.style().refPathEffect());
shape.style().strokeRec().applyToPaint(&paint);
paint.setAntiAlias(GrAA::kYes == aa);
SkMatrix translatedMatrix = matrix;
translatedMatrix.postTranslate(fTranslate.fX, fTranslate.fY);
@ -70,11 +82,46 @@ void GrSWMaskHelper::drawShape(const GrStyledShape& shape, const SkMatrix& matri
SkASSERT(0xFF == paint.getAlpha());
fDraw.drawPathCoverage(path, paint);
} else {
paint.setBlendMode(op_to_mode(op));
paint.setColor(SkColorSetARGB(alpha, alpha, alpha, alpha));
fDraw.drawPath(path, paint);
}
};
}
void GrSWMaskHelper::drawShape(const GrShape& shape, const SkMatrix& matrix, SkRegion::Op op,
GrAA aa, uint8_t alpha) {
SkPaint paint = get_paint(op, aa, alpha);
SkMatrix translatedMatrix = matrix;
translatedMatrix.postTranslate(fTranslate.fX, fTranslate.fY);
fDraw.fMatrix = &translatedMatrix;
if (shape.inverted()) {
if (shape.isEmpty() || shape.isLine() || shape.isPoint()) {
// These shapes are empty for simple fills, so when inverted, cover everything
fDraw.drawPaint(paint);
return;
}
// Else fall through to the draw method using asPath(), which will toggle fill type properly
} else if (shape.isEmpty() || shape.isLine() || shape.isPoint()) {
// Do nothing, these shapes do not cover any pixels for simple fills
return;
} else if (shape.isRect()) {
fDraw.drawRect(shape.rect(), paint);
return;
} else if (shape.isRRect()) {
fDraw.drawRRect(shape.rrect(), paint);
return;
}
// A complex, or inverse-filled shape, so go through drawPath.
SkPath path;
shape.asPath(&path);
if (SkRegion::kReplace_Op == op && 0xFF == alpha) {
SkASSERT(0xFF == paint.getAlpha());
fDraw.drawPathCoverage(path, paint);
} else {
fDraw.drawPath(path, paint);
}
}
bool GrSWMaskHelper::init(const SkIRect& resultBounds) {
// We will need to translate draws so the bound's UL corner is at the origin

7
src/gpu/GrSWMaskHelper.h
View File

@ -16,6 +16,7 @@
#include "src/core/SkDraw.h"
#include "src/core/SkRasterClip.h"
class GrShape;
class GrStyledShape;
class GrRecordingContext;
class GrTextureProxy;
@ -48,9 +49,15 @@ public:
// Draw a single rect into the accumulation bitmap using the specified op
void drawRect(const SkRect& rect, const SkMatrix& matrix, SkRegion::Op op, GrAA, uint8_t alpha);
// Draw a single rrect into the accumulation bitmap using the specified op
void drawRRect(const SkRRect& rrect, const SkMatrix& matrix, SkRegion::Op op, GrAA,
uint8_t alpha);
// Draw a single path into the accumuation bitmap using the specified op
void drawShape(const GrStyledShape&, const SkMatrix& matrix, SkRegion::Op op, GrAA,
uint8_t alpha);
// Like the GrStyledShape variant, but assumes a simple fill style
void drawShape(const GrShape&, const SkMatrix& matrix, SkRegion::Op op, GrAA, uint8_t alpha);
GrSurfaceProxyView toTextureView(GrRecordingContext*, SkBackingFit fit);