Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I0b36f486,Ida0d0dee into sc-dev

Browse Source 
* changes:
  Improve Stretch shader performance more
  Improve Stretch shader performance
This commit is contained in:
Nader Jawad
2021-05-14 17:03:18 +00:00
committed by Android (Google) Code Review
parent 830db628b8 76d84aec28
commit 40943ec440
1 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
libs/hwui/effects/StretchEffect.cpp
View File

@@ -94,13 +94,14 @@ static const SkString stretchShader = SkString(R"(
float uStretchAffectedDist, float uStretchAffectedDist,
float uInverseStretchAffectedDist, float uInverseStretchAffectedDist,
float distanceStretched, float distanceStretched,
float interpolationStrength float interpolationStrength,
float viewportDimension
) { ) {
float offsetPos = inPos - reverseStretchDist; float offsetPos = inPos - reverseStretchDist;
float posBasedVariation = mix( float posBasedVariation = mix(
1. ,easeIn(offsetPos, uInverseStretchAffectedDist), interpolationStrength); 1. ,easeIn(offsetPos, uInverseStretchAffectedDist), interpolationStrength);
float stretchIntensity = (-overscroll) * posBasedVariation; float stretchIntensity = (-overscroll) * posBasedVariation;
return 1 - (distanceStretched - (offsetPos / (1. + stretchIntensity))); return viewportDimension - (distanceStretched - (offsetPos / (1. + stretchIntensity)));
} }
// Prefer usage of return values over out parameters as it enables // Prefer usage of return values over out parameters as it enables
@@ -113,54 +114,51 @@ static const SkString stretchShader = SkString(R"(
float uInverseStretchAffectedDist, float uInverseStretchAffectedDist,
float distanceStretched, float distanceStretched,
float distanceDiff, float distanceDiff,
float interpolationStrength float interpolationStrength,
float viewportDimension
) { ) {
float outPos = inPos;
if (overscroll > 0) { if (overscroll > 0) {
if (inPos <= uStretchAffectedDist) { if (inPos <= uStretchAffectedDist) {
outPos = computeOverscrollStart( return computeOverscrollStart(
inPos, inPos,
overscroll, overscroll,
uStretchAffectedDist, uStretchAffectedDist,
uInverseStretchAffectedDist, uInverseStretchAffectedDist,
distanceStretched, distanceStretched,
interpolationStrength interpolationStrength
); );
} else if (inPos >= distanceStretched) { } else {
outPos = distanceDiff + inPos; return distanceDiff + inPos;
}
} }
if (overscroll < 0) { } else if (overscroll < 0) {
float stretchAffectedDist = 1. - uStretchAffectedDist; float stretchAffectedDist = viewportDimension - uStretchAffectedDist;
if (inPos >= stretchAffectedDist) { if (inPos >= stretchAffectedDist) {
outPos = computeOverscrollEnd( return computeOverscrollEnd(
inPos, inPos,
overscroll, overscroll,
stretchAffectedDist, stretchAffectedDist,
uStretchAffectedDist, uStretchAffectedDist,
uInverseStretchAffectedDist, uInverseStretchAffectedDist,
distanceStretched, distanceStretched,
interpolationStrength interpolationStrength,
); viewportDimension
} else if (inPos < stretchAffectedDist) { );
outPos = -distanceDiff + inPos; } else {
} return -distanceDiff + inPos;
} }
return outPos; } else {
return inPos;
}
} }
vec4 main(vec2 coord) { vec4 main(vec2 coord) {
// Normalize SKSL pixel coordinate into a unit vector float inU = coord.x;
float inU = coord.x / viewportWidth; float inV = coord.y;
float inV = coord.y / viewportHeight;
float outU; float outU;
float outV; float outV;
float stretchIntensity;
// Add the normalized scroll position within scrolling list
inU += uScrollX; inU += uScrollX;
inV += uScrollY; inV += uScrollY;
outU = inU;
outV = inV;
outU = computeOverscroll( outU = computeOverscroll(
inU, inU,
uOverscrollX, uOverscrollX,
@@ -168,7 +166,8 @@ static const SkString stretchShader = SkString(R"(
uInverseDistanceStretchedX, uInverseDistanceStretchedX,
uDistanceStretchedX, uDistanceStretchedX,
uDistDiffX, uDistDiffX,
uInterpolationStrength uInterpolationStrength,
viewportWidth
); );
outV = computeOverscroll( outV = computeOverscroll(
inV, inV,
@@ -177,15 +176,15 @@ static const SkString stretchShader = SkString(R"(
uInverseDistanceStretchedY, uInverseDistanceStretchedY,
uDistanceStretchedY, uDistanceStretchedY,
uDistDiffY, uDistDiffY,
uInterpolationStrength uInterpolationStrength,
viewportHeight
); );
coord.x = outU * viewportWidth; coord.x = outU;
coord.y = outV * viewportHeight; coord.y = outV;
return sample(uContentTexture, coord); return sample(uContentTexture, coord);
})"); })");
static const float ZERO = 0.f; static const float ZERO = 0.f;
static const float CONTENT_DISTANCE_STRETCHED = 1.f;
static const float INTERPOLATION_STRENGTH_VALUE = 0.7f; static const float INTERPOLATION_STRENGTH_VALUE = 0.7f;
sk_sp<SkShader> StretchEffect::getShader(float width, float height, sk_sp<SkShader> StretchEffect::getShader(float width, float height,
@@ -196,12 +195,12 @@ sk_sp<SkShader> StretchEffect::getShader(float width, float height,
float normOverScrollDistX = mStretchDirection.x(); float normOverScrollDistX = mStretchDirection.x();
float normOverScrollDistY = mStretchDirection.y(); float normOverScrollDistY = mStretchDirection.y();
float distanceStretchedX = CONTENT_DISTANCE_STRETCHED / (1 + abs(normOverScrollDistX)); float distanceStretchedX = width / (1 + abs(normOverScrollDistX));
float distanceStretchedY = CONTENT_DISTANCE_STRETCHED / (1 + abs(normOverScrollDistY)); float distanceStretchedY = height / (1 + abs(normOverScrollDistY));
float inverseDistanceStretchedX = 1.f / CONTENT_DISTANCE_STRETCHED; float inverseDistanceStretchedX = 1.f / width;
float inverseDistanceStretchedY = 1.f / CONTENT_DISTANCE_STRETCHED; float inverseDistanceStretchedY = 1.f / height;
float diffX = distanceStretchedX - CONTENT_DISTANCE_STRETCHED; float diffX = distanceStretchedX - width;
float diffY = distanceStretchedY - CONTENT_DISTANCE_STRETCHED; float diffY = distanceStretchedY - height;
if (mBuilder == nullptr) { if (mBuilder == nullptr) {
mBuilder = std::make_unique<SkRuntimeShaderBuilder>(getStretchEffect()); mBuilder = std::make_unique<SkRuntimeShaderBuilder>(getStretchEffect());
@@ -210,8 +209,8 @@ sk_sp<SkShader> StretchEffect::getShader(float width, float height,
mBuilder->child("uContentTexture") = snapshotImage->makeShader( mBuilder->child("uContentTexture") = snapshotImage->makeShader(
SkTileMode::kClamp, SkTileMode::kClamp, SkSamplingOptions(SkFilterMode::kLinear)); SkTileMode::kClamp, SkTileMode::kClamp, SkSamplingOptions(SkFilterMode::kLinear));
mBuilder->uniform("uInterpolationStrength").set(&INTERPOLATION_STRENGTH_VALUE, 1); mBuilder->uniform("uInterpolationStrength").set(&INTERPOLATION_STRENGTH_VALUE, 1);
mBuilder->uniform("uStretchAffectedDistX").set(&CONTENT_DISTANCE_STRETCHED, 1); mBuilder->uniform("uStretchAffectedDistX").set(&width, 1);
mBuilder->uniform("uStretchAffectedDistY").set(&CONTENT_DISTANCE_STRETCHED, 1); mBuilder->uniform("uStretchAffectedDistY").set(&height, 1);
mBuilder->uniform("uDistanceStretchedX").set(&distanceStretchedX, 1); mBuilder->uniform("uDistanceStretchedX").set(&distanceStretchedX, 1);
mBuilder->uniform("uDistanceStretchedY").set(&distanceStretchedY, 1); mBuilder->uniform("uDistanceStretchedY").set(&distanceStretchedY, 1);
mBuilder->uniform("uInverseDistanceStretchedX").set(&inverseDistanceStretchedX, 1); mBuilder->uniform("uInverseDistanceStretchedX").set(&inverseDistanceStretchedX, 1);