diff options
| author | 2023-10-13 16:53:27 +0000 | |
|---|---|---|
| committer | 2023-10-13 16:53:27 +0000 | |
| commit | d053371e107ad02dea97d424a672ca40b76b7103 (patch) | |
| tree | 52fbc748195be50321405ffb7954049ef2d69adb | |
| parent | 781101ec2437f1f96bc859b6b76024ba51a8a7d8 (diff) | |
| parent | ed5fe20479ef0887255f014fc4048aaac217e756 (diff) | |
Merge "Avoid accidental shadowing in AGSL code." into main
| -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" |