Remove some unneeded SkSpan calls
Change-Id: Ic2052c326581f67bd9b9480ed1912997272471f6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/550219
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
diff --git a/gm/mesh.cpp b/gm/mesh.cpp
index fd56e20..e589836 100644
--- a/gm/mesh.cpp
+++ b/gm/mesh.cpp
@@ -57,9 +57,9 @@
}
)";
auto[spec, error] =
- SkMeshSpecification::Make(SkSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+ SkMeshSpecification::Make(kAttributes,
sizeof(ColorVertex),
- SkSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+ kVaryings,
SkString(kVS),
SkString(kFS));
if (!spec) {
@@ -87,9 +87,9 @@
}
)";
auto[spec, error] =
- SkMeshSpecification::Make(SkSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+ SkMeshSpecification::Make(kAttributes,
sizeof(NoColorVertex),
- SkSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+ kVaryings,
SkString(kVS),
SkString(kFS));
if (!spec) {
@@ -380,9 +380,9 @@
}
auto [spec, error] = SkMeshSpecification::Make(
- SkSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+ kAttributes,
sizeof(Vertex),
- SkSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+ kVaryings,
SkString(vs),
SkString(kFS),
std::move(cs),
@@ -510,9 +510,9 @@
}
)";
auto [spec, error] =
- SkMeshSpecification::Make(SkSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+ SkMeshSpecification::Make(kAttributes,
sizeof(Vertex),
- SkSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+ kVaryings,
SkString(kVS),
SkString(kFS),
SkColorSpace::MakeSRGB(),
diff --git a/modules/svg/include/SkSVGTypes.h b/modules/svg/include/SkSVGTypes.h
index 9e88e27..db103be 100644
--- a/modules/svg/include/SkSVGTypes.h
+++ b/modules/svg/include/SkSVGTypes.h
@@ -204,10 +204,10 @@
Type type() const { return fType; }
const SkSVGColorType& color() const { SkASSERT(fType == Type::kColor); return fColor; }
SkSpan<const SkString> vars() const {
- return fVars ? SkSpan<const SkString>(fVars->fData) : SkSpan<const SkString>{nullptr, 0};
+ return fVars ? SkSpan<const SkString>(fVars->fData) : SkSpan<const SkString>();
}
- SkSpan< SkString> vars() {
- return fVars ? SkSpan<SkString>(fVars->fData) : SkSpan< SkString>{nullptr, 0};
+ SkSpan<SkString> vars() {
+ return fVars ? SkSpan<SkString>(fVars->fData) : SkSpan<SkString>();
}
private:
diff --git a/tests/MeshTest.cpp b/tests/MeshTest.cpp
index c4e6150..fa19eac 100644
--- a/tests/MeshTest.cpp
+++ b/tests/MeshTest.cpp
@@ -135,9 +135,9 @@
static void test_good(skiatest::Reporter* r) {
for (const auto& validFS : kValidFSes) {
if (!check_for_success(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
validFS)) {
return;
@@ -184,9 +184,9 @@
invalidVS.appendf("%s %s", vsSig, kVSBody);
for (const auto& validFS : kValidFSes) {
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
invalidVS,
validFS)) {
return;
@@ -198,9 +198,9 @@
SkString invalidFS;
invalidFS.appendf("%s %s", noColorFSSig, kNoColorFSBody);
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
invalidFS)) {
return;
@@ -211,9 +211,9 @@
SkString invalidFS;
invalidFS.appendf("%s %s", colorFSSig, kColorFSBody);
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
invalidFS)) {
return;
@@ -231,9 +231,9 @@
)"
};
check_for_success(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kFloat4FS);
}
@@ -247,9 +247,9 @@
SkString badVS = kValidVS;
badVS.prepend(global);
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
badVS,
kValidFSes[0])) {
return;
@@ -259,9 +259,9 @@
SkString badFS = kValidFSes[0];
badFS.prepend(global);
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
badFS)) {
return;
@@ -433,8 +433,8 @@
}
fs.prepend(unis);
- auto attrs = SkSpan(kValidAttrs , SK_ARRAY_COUNT(kValidAttrs) );
- auto varys = SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings));
+ auto attrs = SkSpan(kValidAttrs);
+ auto varys = SkSpan(kValidVaryings);
sk_sp<SkMeshSpecification> spec;
if (!check_for_success(r, attrs, kValidStride, varys, vs, fs, &spec)) {
return;
@@ -524,8 +524,8 @@
SkString fs = kValidFSes[0];
fs.prepend(u2);
- auto attrs = SkSpan(kValidAttrs , SK_ARRAY_COUNT(kValidAttrs) );
- auto varys = SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings));
+ auto attrs = SkSpan(kValidAttrs);
+ auto varys = SkSpan(kValidVaryings);
if (!check_for_failure(r, attrs, kValidStride, varys, vs, fs)) {
return;
}
@@ -538,9 +538,9 @@
// Empty VS
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
SkString{},
kValidFSes[0])) {
return;
@@ -548,9 +548,9 @@
// VS with helper function but no main
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kHelper,
kValidFSes[0])) {
return;
@@ -558,9 +558,9 @@
// Empty FS
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
SkString{})) {
return;
@@ -568,9 +568,9 @@
// VS with helper function but no main
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kHelper)) {
return;
@@ -582,7 +582,7 @@
check_for_failure(r,
SkSpan<Attribute>(),
kValidStride,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kValidFSes[0]);
}
@@ -590,7 +590,7 @@
static void test_zero_varyings(skiatest::Reporter* r) {
// Varyings are not required.
check_for_success(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
SkSpan<Varying>(),
kValidVS,
@@ -600,9 +600,9 @@
static void test_bad_strides(skiatest::Reporter* r) {
// Zero stride
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
0,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kValidFSes[0])) {
return;
@@ -610,9 +610,9 @@
// Unaligned
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride + 1,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kValidFSes[0])) {
return;
@@ -620,9 +620,9 @@
// Too large
if (!check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
1 << 20,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kValidFSes[0])) {
return;
@@ -635,9 +635,9 @@
{Attribute::Type::kFloat4, 1, SkString{"var"}},
};
if (!check_for_failure(r,
- SkSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+ kAttributes,
32,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kValidFSes[0])) {
return;
@@ -649,9 +649,9 @@
{Attribute::Type::kFloat2, 16, SkString{"var"}},
};
if (!check_for_failure(r,
- SkSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+ kAttributes,
20,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kValidFSes[0])) {
return;
@@ -662,9 +662,9 @@
{Attribute::Type::kFloat, std::numeric_limits<size_t>::max() - 3, SkString{"var"}},
};
if (!check_for_failure(r,
- SkSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+ kAttributes,
4,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kValidFSes[0])) {
return;
@@ -680,9 +680,9 @@
attrs.push_back({Attribute::Type::kFloat4, 0, SkStringPrintf("attr%zu", i)});
}
check_for_failure(r,
- SkSpan(attrs),
+ attrs,
4*4,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kValidFSes[0]);
}
@@ -695,7 +695,7 @@
varyings.push_back({Varying::Type::kFloat4, SkStringPrintf("varying%zu", i)});
}
check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
SkSpan(varyings),
kValidVS,
@@ -708,9 +708,9 @@
{Attribute::Type::kFloat2, 16, SkString{"var"}}
};
check_for_failure(r,
- SkSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+ kAttributes,
24,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kValidFSes[0]);
}
@@ -721,9 +721,9 @@
{Varying::Type::kFloat3, SkString{"var"}}
};
check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+ kVaryings,
kValidVS,
kValidFSes[0]);
}
@@ -735,9 +735,9 @@
{Attribute::Type::kFloat4, 0, SkString{kSneakyName}},
};
check_for_failure(r,
- SkSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+ kAttributes,
16,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kValidFSes[0]);
}
@@ -747,9 +747,9 @@
{Varying::Type::kFloat4, SkString{kSneakyName}},
};
check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+ kVaryings,
kValidVS,
kValidFSes[0]);
}
@@ -759,9 +759,9 @@
{Attribute::Type::kFloat4, 0, SkString{}},
};
check_for_failure(r,
- SkSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+ kAttributes,
16,
- SkSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+ kValidVaryings,
kValidVS,
kValidFSes[0]);
}
@@ -771,9 +771,9 @@
{Varying::Type::kFloat4, SkString{}},
};
check_for_failure(r,
- SkSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+ kValidAttrs,
kValidStride,
- SkSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+ kVaryings,
kValidVS,
kValidFSes[0]);
}
