Make cap only affect the keys of GrShapes that are possibly-open
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1949193002
Review-Url: https://codereview.chromium.org/1949193002
diff --git a/src/gpu/GrShape.cpp b/src/gpu/GrShape.cpp
index 3b49f6a..84e14e8 100644
--- a/src/gpu/GrShape.cpp
+++ b/src/gpu/GrShape.cpp
@@ -103,7 +103,11 @@
return;
}
}
- int styleCnt = GrStyle::KeySize(parent.fStyle, apply);
+ uint32_t styleKeyFlags = 0;
+ if (parent.knownToBeClosed()) {
+ styleKeyFlags |= GrStyle::kClosed_KeyFlag;
+ }
+ int styleCnt = GrStyle::KeySize(parent.fStyle, apply, styleKeyFlags);
if (styleCnt < 0) {
// The style doesn't allow a key, set the path to volatile so that we fail when
// we try to get a key for the shape.
@@ -120,7 +124,7 @@
parentCnt * sizeof(uint32_t));
}
// Now turn (geo,path_effect) or (geo) into (geo,path_effect,stroke)
- GrStyle::WriteKey(fInheritedKey.get() + parentCnt, parent.fStyle, apply);
+ GrStyle::WriteKey(fInheritedKey.get() + parentCnt, parent.fStyle, apply, styleKeyFlags);
}
}
diff --git a/src/gpu/GrShape.h b/src/gpu/GrShape.h
index efc28cf..f4bd7e5 100644
--- a/src/gpu/GrShape.h
+++ b/src/gpu/GrShape.h
@@ -120,6 +120,9 @@
void asPath(SkPath* out) const {
switch (fType) {
+ case Type::kEmpty:
+ out->reset();
+ break;
case Type::kRRect:
out->reset();
out->addRRect(fRRect);
@@ -127,13 +130,26 @@
case Type::kPath:
*out = *fPath.get();
break;
- case Type::kEmpty:
- out->reset();
- break;
}
}
/**
+ * Is it known that the shape has no unclosed contours. This means that it will not have
+ * any caps if stroked (modulo the effect of any path effect).
+ */
+ bool knownToBeClosed() const {
+ switch (fType) {
+ case Type::kEmpty:
+ return true;
+ case Type::kRRect:
+ return true;
+ case Type::kPath:
+ return false;
+ }
+ return false;
+ }
+
+ /**
* Gets the size of the key for the shape represented by this GrShape (ignoring its styling).
* A negative value is returned if the shape has no key (shouldn't be cached).
*/
diff --git a/src/gpu/GrStyle.cpp b/src/gpu/GrStyle.cpp
index 7d70baa..6480fb3 100644
--- a/src/gpu/GrStyle.cpp
+++ b/src/gpu/GrStyle.cpp
@@ -7,7 +7,7 @@
#include "GrStyle.h"
-int GrStyle::KeySize(const GrStyle &style, Apply apply) {
+int GrStyle::KeySize(const GrStyle &style, Apply apply, uint32_t flags) {
GR_STATIC_ASSERT(sizeof(uint32_t) == sizeof(SkScalar));
int size = 0;
if (style.isDashed()) {
@@ -29,7 +29,7 @@
return size;
}
-void GrStyle::WriteKey(uint32_t *key, const GrStyle &style, Apply apply) {
+void GrStyle::WriteKey(uint32_t *key, const GrStyle &style, Apply apply, uint32_t flags) {
SkASSERT(key);
SkASSERT(KeySize(style, apply) >= 0);
GR_STATIC_ASSERT(sizeof(uint32_t) == sizeof(SkScalar));
@@ -63,9 +63,17 @@
GR_STATIC_ASSERT(SkStrokeRec::kStyleCount <= (1 << kStyleBits));
GR_STATIC_ASSERT(SkPaint::kJoinCount <= (1 << kJoinBits));
GR_STATIC_ASSERT(SkPaint::kCapCount <= (1 << kCapBits));
+ // The cap type only matters for unclosed shapes. However, a path effect could unclose
+ // the shape before it is stroked.
+ SkPaint::Cap cap;
+ if ((flags & kClosed_KeyFlag) && !style.pathEffect()) {
+ cap = SkPaint::kButt_Cap;
+ } else {
+ cap = style.strokeRec().getCap();
+ }
key[i++] = style.strokeRec().getStyle() |
style.strokeRec().getJoin() << kJoinShift |
- style.strokeRec().getCap() << kCapShift;
+ cap << kCapShift;
SkScalar scalar;
// Miter limit only affects miter joins
diff --git a/src/gpu/GrStyle.h b/src/gpu/GrStyle.h
index d63df32..c65b22b 100644
--- a/src/gpu/GrStyle.h
+++ b/src/gpu/GrStyle.h
@@ -49,21 +49,30 @@
};
/**
+ * Optional flags for computing keys that may remove unnecessary variation in the key due to
+ * style settings that don't affect particular classes of geometry.
+ */
+ enum KeyFlags {
+ // The shape being styled has no open contours.
+ kClosed_KeyFlag = 0x1
+ };
+
+ /**
* Computes the key length for a GrStyle. The return will be negative if it cannot be turned
* into a key. This occurs when there is a path effect that is not a dash. The key can
* either reflect just the path effect (if one) or the path effect and the strokerec. Note
* that a simple fill has a zero sized key.
*/
- static int KeySize(const GrStyle& , Apply);
+ static int KeySize(const GrStyle& , Apply, uint32_t flags = 0);
/**
* Writes a unique key for the style into the provided buffer. This function assumes the buffer
* has room for at least KeySize() values. It assumes that KeySize() returns a non-negative
- * value for the style and Apply param. This is written so that the key for just dash
- * application followed by the key for the remaining SkStrokeRec is the same as the key for
- * applying dashing and SkStrokeRec all at once.
+ * value for the combination of GrStyle, Apply and flags params. This is written so that the key
+ * for just dash application followed by the key for the remaining SkStrokeRec is the same as
+ * the key for applying dashing and SkStrokeRec all at once.
*/
- static void WriteKey(uint32_t*, const GrStyle&, Apply);
+ static void WriteKey(uint32_t*, const GrStyle&, Apply, uint32_t flags = 0);
GrStyle() : GrStyle(SkStrokeRec::kFill_InitStyle) {}