Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 976a9062 authored by John Stiles's avatar John Stiles Committed by Automerger Merge Worker
Browse files

Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783534



Change-Id: I7a975e917be21494006bc7a9de71ee46d520902c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6dc82990 d053371e

graphics/java/android/graphics/drawable/RippleShader.java

+2 −3
Original line number Diff line number Diff line
@@ -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"