diff options
| author | 2023-10-13 17:52:53 +0000 | |
|---|---|---|
| committer | 2023-10-13 17:52:53 +0000 | |
| commit | 2cce29e6789f632c88be4e674e2454dd229d991d (patch) | |
| tree | 4da1e4d8e247f64aa1e4d7a0c04b5fddd7c9682f /graphics/java | |
| parent | 58ab4b3e81c01fc40db5b0b1647413d01bf6a21c (diff) | |
| parent | 9fce1b42c316755a5ab2fa0b08279000038a2ee4 (diff) | |
Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e10 am: 976a90621b am: 9fce1b42c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534
Change-Id: Ia8641e789c625fd55c50783bb9dbcf3ba5c90b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'graphics/java')
| -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" |