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

Commit 2cce29e6 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 am:... 

Merge "Avoid accidental shadowing in AGSL code." into main am: d053371e am: 976a9062 am: 9fce1b42

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



Change-Id: Ia8641e789c625fd55c50783bb9dbcf3ba5c90b73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58ab4b3e 9fce1b42

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -109,9 +109,8 @@ final class RippleShader extends RuntimeShader { 
            + "    float alpha = min(fadeIn, 1. - fadeOutNoise);\n"

            + "    float alpha = min(fadeIn, 1. - fadeOutNoise);\n"

            + "    vec2 uv = p * in_resolutionScale;\n"

            + "    vec2 uv = p * in_resolutionScale;\n"

            + "    vec2 densityUv = uv - mod(uv, in_noiseScale);\n"

            + "    vec2 densityUv = uv - mod(uv, in_noiseScale);\n"

            + "    float turbulence = turbulence(uv, in_turbulencePhase);\n"

            + "    float turb = turbulence(uv, in_turbulencePhase);\n"

            + "    float sparkleAlpha = sparkles(densityUv, in_noisePhase) * ring * alpha "

            + "    float sparkleAlpha = sparkles(densityUv, in_noisePhase) * ring * alpha * turb;\n"

            + "* turbulence;\n"

            + "    float fade = min(fadeIn, 1. - fadeOutRipple);\n"

            + "    float fade = min(fadeIn, 1. - fadeOutRipple);\n"

            + "    float waveAlpha = softCircle(p, center, in_maxRadius * scaleIn, 1.) * fade "

            + "    float waveAlpha = softCircle(p, center, in_maxRadius * scaleIn, 1.) * fade "

            + "* in_color.a;\n"

            + "* in_color.a;\n"