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

Include conic weights in GrPath cache kSimpleVolatilePathDomain keys

Browse Source 
Include conic weights in the keys when caching GrPath in
kSimpleVolatilePathDomain.

BUG=skia:4580

Review URL: https://codereview.chromium.org/1472733002
This commit is contained in:
kkinnunen 2015-11-26 01:51:44 -08:00 committed by Commit bot
parent 8444913d2c
commit f15246320c
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/gpu/GrPath.cpp
View File

@ -78,6 +78,19 @@ inline static bool compute_key_for_simple_path(const SkPath& path, const GrStrok
SkASSERT(false);
return false;
}
SkSTArray<16, SkScalar, true> conicWeights(16);
if ((path.getSegmentMasks() & SkPath::kConic_SegmentMask) != 0) {
SkPath::RawIter iter(path);
SkPath::Verb verb;
SkPoint points[4];
while ((verb = iter.next(points)) != SkPath::kDone_Verb) {
if (verb == SkPath::kConic_Verb) {
conicWeights.push_back(iter.conicWeight());
}
}
}
const int conicWeightCnt = conicWeights.count();
// Construct counts that align as uint32_t counts.
#define ARRAY_DATA32_COUNT(array_type, count) \
@ -85,16 +98,17 @@ inline static bool compute_key_for_simple_path(const SkPath& path, const GrStrok
const int verbData32Cnt = ARRAY_DATA32_COUNT(uint8_t, verbCnt);
const int pointData32Cnt = ARRAY_DATA32_COUNT(SkPoint, pointCnt);
const int conicWeightData32Cnt = ARRAY_DATA32_COUNT(SkScalar, conicWeightCnt);
#undef ARRAY_DATA32_COUNT
// The unique key data is a "message" with following fragments:
// 0) domain, key length, uint32_t for fill type and uint32_t for verbCnt
// (fragment 0, fixed size)
// 1) verb and point data (varying size)
// 1) verb, point data and conic weights (varying size)
// 2) stroke data (varying size)
const int baseData32Cnt = 2 + verbData32Cnt + pointData32Cnt;
const int baseData32Cnt = 2 + verbData32Cnt + pointData32Cnt + conicWeightData32Cnt;
const int strokeDataCnt = stroke.computeUniqueKeyFragmentData32Cnt();
static const GrUniqueKey::Domain kSimpleVolatilePathDomain = GrUniqueKey::GenerateDomain();
GrUniqueKey::Builder builder(key, kSimpleVolatilePathDomain, baseData32Cnt + strokeDataCnt);
@ -103,11 +117,12 @@ inline static bool compute_key_for_simple_path(const SkPath& path, const GrStrok
// Serialize the verbCnt to make the whole message unambiguous.
// We serialize two variable length fragments to the message:
// * verb and point data (fragment 1)
// * verbs, point data and conic weights (fragment 1)
// * stroke data (fragment 2)
// "Proof:"
// Verb count establishes unambiguous verb data.
// Unambiguous verb data establishes unambiguous point data, making fragment 1 unambiguous.
// Verbs encode also point data size and conic weight size.
// Thus the fragment 1 is unambiguous.
// Unambiguous fragment 1 establishes unambiguous fragment 2, since the length of the message
// has been established.
@ -127,8 +142,16 @@ inline static bool compute_key_for_simple_path(const SkPath& path, const GrStrok
// Here we assume getPoints does a memcpy, so that we do not need to worry about the alignment.
path.getPoints(reinterpret_cast<SkPoint*>(&builder[i]), pointCnt);
SkDEBUGCODE(i += pointData32Cnt);
i += pointData32Cnt;
if (conicWeightCnt > 0) {
if (conicWeightData32Cnt != static_cast<int>(
(conicWeightCnt * sizeof(SkScalar) / sizeof(uint32_t)))) {
builder[i + conicWeightData32Cnt - 1] = 0;
}
memcpy(&builder[i], conicWeights.begin(), conicWeightCnt * sizeof(SkScalar));
SkDEBUGCODE(i += conicWeightData32Cnt);
}
SkASSERT(i == baseData32Cnt);
if (strokeDataCnt > 0) {
stroke.asUniqueKeyFragment(&builder[baseData32Cnt]);

4
tests/GpuDrawPathTest.cpp
View File

@ -128,9 +128,7 @@ DEF_TEST(GrPathKeys, reporter) {
GrStrokeInfo stroke(SkStrokeRec::kFill_InitStyle);
GrPath::ComputeKey(path1, stroke, &key1, &isVolatile);
GrPath::ComputeKey(path2, stroke, &key2, &isVolatile);
// https://bugs.chromium.org/p/skia/issues/detail?id=4580
// REPORTER_ASSERT(reporter, key1 != key2);
REPORTER_ASSERT(reporter, key1 != key2);
}
#endif