Reland "ccpr: Implement stroking with fine triangle strips"
This is a reland of 2f2757fa6ba8134330e05694d08907f6e37abb41
Original change's description:
> ccpr: Implement stroking with fine triangle strips
>
> Implements strokes by linearizing the curve into fine triangle strips
> and interpolating a coverage ramp for edge AA. Each triangle in the
> strip emits either positive or negative coverage, depending on its
> winding direction. Joins and caps are drawn with the existing CCPR
> shaders for triangles and conics.
>
> Conic strokes and non-rigid-body transforms are not yet supported.
>
> Bug: skia:
> Change-Id: I45a819abd64e91c2b62e992587eb85c703e09e77
> Reviewed-on: https://skia-review.googlesource.com/148243
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Allan MacKinnon <allanmac@google.com>
TBR=robertphillips@google.com
Bug: skia:
Change-Id: I3f0065e80975ee8334300bc5e934231b66b49178
Reviewed-on: https://skia-review.googlesource.com/151188
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
diff --git a/src/gpu/ccpr/GrCCPathCache.cpp b/src/gpu/ccpr/GrCCPathCache.cpp
index 01781b0..7d3fe2a 100644
--- a/src/gpu/ccpr/GrCCPathCache.cpp
+++ b/src/gpu/ccpr/GrCCPathCache.cpp
@@ -45,27 +45,47 @@
// Produces a key that accounts both for a shape's path geometry, as well as any stroke/style.
class WriteStyledKey {
public:
- WriteStyledKey(const GrShape& shape)
- : fShapeUnstyledKeyCount(shape.unstyledKeySize())
- , fStyleKeyCount(
- GrStyle::KeySize(shape.style(), GrStyle::Apply::kPathEffectAndStrokeRec)) {}
+ static constexpr int kStyledKeySizeInBytesIdx = 0;
+ static constexpr int kStrokeWidthIdx = 1;
+ static constexpr int kStrokeMiterIdx = 2;
+ static constexpr int kStrokeCapJoinIdx = 3;
+ static constexpr int kShapeUnstyledKeyIdx = 4;
+
+ static constexpr int kStrokeKeyCount = 3; // [width, miterLimit, cap|join].
+
+ WriteStyledKey(const GrShape& shape) : fShapeUnstyledKeyCount(shape.unstyledKeySize()) {}
// Returns the total number of uint32_t's to allocate for the key.
- int allocCountU32() const { return 2 + fShapeUnstyledKeyCount + fStyleKeyCount; }
+ int allocCountU32() const { return kShapeUnstyledKeyIdx + fShapeUnstyledKeyCount; }
// Writes the key to out[].
void write(const GrShape& shape, uint32_t* out) {
- // How many bytes remain in the key, beginning on out[1]?
- out[0] = (1 + fShapeUnstyledKeyCount + fStyleKeyCount) * sizeof(uint32_t);
- out[1] = fStyleKeyCount;
- shape.writeUnstyledKey(&out[2]);
- GrStyle::WriteKey(&out[2 + fShapeUnstyledKeyCount], shape.style(),
- GrStyle::Apply::kPathEffectAndStrokeRec, 1);
+ out[kStyledKeySizeInBytesIdx] =
+ (kStrokeKeyCount + fShapeUnstyledKeyCount) * sizeof(uint32_t);
+
+ // Stroke key.
+ // We don't use GrStyle::WriteKey() because it does not account for hairlines.
+ // http://skbug.com/8273
+ SkASSERT(!shape.style().hasPathEffect());
+ const SkStrokeRec& stroke = shape.style().strokeRec();
+ if (stroke.isFillStyle()) {
+ // Use a value for width that won't collide with a valid fp32 value >= 0.
+ out[kStrokeWidthIdx] = ~0;
+ out[kStrokeMiterIdx] = out[kStrokeCapJoinIdx] = 0;
+ } else {
+ float width = stroke.getWidth(), miterLimit = stroke.getMiter();
+ memcpy(&out[kStrokeWidthIdx], &width, sizeof(float));
+ memcpy(&out[kStrokeMiterIdx], &miterLimit, sizeof(float));
+ out[kStrokeCapJoinIdx] = (stroke.getCap() << 16) | stroke.getJoin();
+ GR_STATIC_ASSERT(sizeof(out[kStrokeWidthIdx]) == sizeof(float));
+ }
+
+ // Shape unstyled key.
+ shape.writeUnstyledKey(&out[kShapeUnstyledKeyIdx]);
}
private:
int fShapeUnstyledKeyCount;
- int fStyleKeyCount;
};
}