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

Take 'gCoeffs' array out of global scope.

Browse Source 
This array isn't used anywhere outside of a single function; we don't
need it to exist at global scope.

Change-Id: I66d65dcb92d5c7bbcfbd067ef6b6908e4dfd3dd6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/420617
Auto-Submit: John Stiles <johnstiles@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
This commit is contained in:
John Stiles 2021-06-22 16:52:31 -04:00 committed by Skia Commit-Bot
parent e2c4e7e62d
commit 80c83a1225
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/core/SkBlendMode.cpp
View File

@ -44,42 +44,42 @@ bool SkBlendMode_SupportsCoverageAsAlpha(SkBlendMode mode) {
return SkBlendMode_ShouldPreScaleCoverage(mode, false);
}
struct CoeffRec {
SkBlendModeCoeff fSrc;
SkBlendModeCoeff fDst;
};
const CoeffRec gCoeffs[] = {
// For Porter-Duff blend functions, color = src * src coeff + dst * dst coeff
// src coeff dst coeff blend func
// ---------------------- ----------------------- ----------
{ SkBlendModeCoeff::kZero, SkBlendModeCoeff::kZero }, // clear
{ SkBlendModeCoeff::kOne, SkBlendModeCoeff::kZero }, // src
{ SkBlendModeCoeff::kZero, SkBlendModeCoeff::kOne }, // dst
{ SkBlendModeCoeff::kOne, SkBlendModeCoeff::kISA }, // src-over
{ SkBlendModeCoeff::kIDA, SkBlendModeCoeff::kOne }, // dst-over
{ SkBlendModeCoeff::kDA, SkBlendModeCoeff::kZero }, // src-in
{ SkBlendModeCoeff::kZero, SkBlendModeCoeff::kSA }, // dst-in
{ SkBlendModeCoeff::kIDA, SkBlendModeCoeff::kZero }, // src-out
{ SkBlendModeCoeff::kZero, SkBlendModeCoeff::kISA }, // dst-out
{ SkBlendModeCoeff::kDA, SkBlendModeCoeff::kISA }, // src-atop
{ SkBlendModeCoeff::kIDA, SkBlendModeCoeff::kSA }, // dst-atop
{ SkBlendModeCoeff::kIDA, SkBlendModeCoeff::kISA }, // xor
{ SkBlendModeCoeff::kOne, SkBlendModeCoeff::kOne }, // plus
{ SkBlendModeCoeff::kZero, SkBlendModeCoeff::kSC }, // modulate
{ SkBlendModeCoeff::kOne, SkBlendModeCoeff::kISC }, // screen
};
bool SkBlendMode_AsCoeff(SkBlendMode mode, SkBlendModeCoeff* src, SkBlendModeCoeff* dst) {
struct CoeffRec {
SkBlendModeCoeff fSrc;
SkBlendModeCoeff fDst;
};
static constexpr CoeffRec kCoeffs[] = {
// For Porter-Duff blend functions, color = src * src coeff + dst * dst coeff
// src coeff dst coeff blend func
// ---------------------- ----------------------- ----------
{ SkBlendModeCoeff::kZero, SkBlendModeCoeff::kZero }, // clear
{ SkBlendModeCoeff::kOne, SkBlendModeCoeff::kZero }, // src
{ SkBlendModeCoeff::kZero, SkBlendModeCoeff::kOne }, // dst
{ SkBlendModeCoeff::kOne, SkBlendModeCoeff::kISA }, // src-over
{ SkBlendModeCoeff::kIDA, SkBlendModeCoeff::kOne }, // dst-over
{ SkBlendModeCoeff::kDA, SkBlendModeCoeff::kZero }, // src-in
{ SkBlendModeCoeff::kZero, SkBlendModeCoeff::kSA }, // dst-in
{ SkBlendModeCoeff::kIDA, SkBlendModeCoeff::kZero }, // src-out
{ SkBlendModeCoeff::kZero, SkBlendModeCoeff::kISA }, // dst-out
{ SkBlendModeCoeff::kDA, SkBlendModeCoeff::kISA }, // src-atop
{ SkBlendModeCoeff::kIDA, SkBlendModeCoeff::kSA }, // dst-atop
{ SkBlendModeCoeff::kIDA, SkBlendModeCoeff::kISA }, // xor
{ SkBlendModeCoeff::kOne, SkBlendModeCoeff::kOne }, // plus
{ SkBlendModeCoeff::kZero, SkBlendModeCoeff::kSC }, // modulate
{ SkBlendModeCoeff::kOne, SkBlendModeCoeff::kISC }, // screen
};
if (mode > SkBlendMode::kScreen) {
return false;
}
if (src) {
*src = gCoeffs[static_cast<int>(mode)].fSrc;
*src = kCoeffs[static_cast<int>(mode)].fSrc;
}
if (dst) {
*dst = gCoeffs[static_cast<int>(mode)].fDst;
*dst = kCoeffs[static_cast<int>(mode)].fDst;
}
return true;
}