diff options
| author | 2023-10-13 17:19:42 +0000 | |
|---|---|---|
| committer | 2023-10-13 17:19:42 +0000 | |
| commit | 9fce1b42c316755a5ab2fa0b08279000038a2ee4 (patch) | |
| tree | 65fae1f0bfe2d51a7261f9634a78e1c4828bca3e | |
| parent | 7056ff60e840a4b53c7255c023d1b668b9e294a6 (diff) | |
| parent | 976a90621bf880aff30f37ddce742c13227b1832 (diff) | |
Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e10 am: 976a90621b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534
Change-Id: I45deb21cc081f0d0853692685ad036138828fe5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | graphics/java/android/graphics/drawable/RippleShader.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleShader.java b/graphics/java/android/graphics/drawable/RippleShader.java index 4461f39fd006..c2a7a84ad809 100644 --- a/graphics/java/android/graphics/drawable/RippleShader.java +++ b/graphics/java/android/graphics/drawable/RippleShader.java @@ -109,9 +109,8 @@ final class RippleShader extends RuntimeShader { + " float alpha = min(fadeIn, 1. - fadeOutNoise);\n" + " vec2 uv = p * in_resolutionScale;\n" + " vec2 densityUv = uv - mod(uv, in_noiseScale);\n" - + " float turbulence = turbulence(uv, in_turbulencePhase);\n" - + " float sparkleAlpha = sparkles(densityUv, in_noisePhase) * ring * alpha " - + "* turbulence;\n" + + " float turb = turbulence(uv, in_turbulencePhase);\n" + + " float sparkleAlpha = sparkles(densityUv, in_noisePhase) * ring * alpha * turb;\n" + " float fade = min(fadeIn, 1. - fadeOutRipple);\n" + " float waveAlpha = softCircle(p, center, in_maxRadius * scaleIn, 1.) * fade " + "* in_color.a;\n" |