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

Commit d053371e authored by John Stiles's avatar John Stiles Committed by Gerrit Code Review
Browse files

Merge "Avoid accidental shadowing in AGSL code." into main

parents 781101ec ed5fe204

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"