commit 71f6077f3999bb2171e59cbeeb04a1c2fa5033a3
author Steven Moreland <smoreland@google.com> Fri Mar 15 09:47:08 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Mar 15 09:47:08 2019 -0700
tree 8daf39b26b3cb7716d5cb615c94cf9cea41758ea
parent 666ba5d58c674f4d4cdc0509538c4fbf561d6233
parent 91e66f9ba18f3d053859c58d6af97cdd4f79579b

Merge "libbinder_ndk: fix UB memory access for race"
am: 91e66f9ba1

Change-Id: I638cc9c0e4c2b33492284aec6a4d9846b898cfde

services/surfaceflinger/RenderEngine/ProgramCache.cpp

diff --git a/services/surfaceflinger/RenderEngine/ProgramCache.cpp b/services/surfaceflinger/RenderEngine/ProgramCache.cpp
index fe992f1..2073b05 100644
--- a/services/surfaceflinger/RenderEngine/ProgramCache.cpp
+++ b/services/surfaceflinger/RenderEngine/ProgramCache.cpp
@@ -220,7 +220,7 @@
                     const highp float c2 = (2413.0 / 4096.0) * 32.0;
                     const highp float c3 = (2392.0 / 4096.0) * 32.0;
 
-                    highp vec3 tmp = pow(color, 1.0 / vec3(m2));
+                    highp vec3 tmp = pow(clamp(color, 0.0, 1.0), 1.0 / vec3(m2));
                     tmp = max(tmp - c1, 0.0) / (c2 - c3 * tmp);
                     return pow(tmp, 1.0 / vec3(m1));
                 }