drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid accidental shadowing in AGSL code.

Browse Source 
We were shadowing the `turbulence` function with a variable of the
same name. This isn't illegal, but it is not a good idea to do this.
Renamed the variable to `turb`.

Change-Id: Ic2046d2ffe507f03e53a947a884114dd660b143e
This commit is contained in:
John Stiles 2023-10-10 23:48:43 +00:00
parent 0c175e28e5
commit ed5fe20479
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/java/android/graphics/drawable/RippleShader.java
View File

@ -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"