commit f8ddfdbaabe19e50119d5df9aa093d7daacab37f
author Jiyong Park <jiyong@google.com> Fri Mar 15 02:16:32 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Mar 15 02:16:32 2019 -0700
tree ee4f09e3f0214a11a933b6431c3897d5698de5b9
parent 6095b96721660780874304dcee069fbf1c7d5c63
parent 0472824d3edc6aee700b1eb9603f271bab62b50d

Merge "Revert "Have `otapreopt_chroot` bind-mount Bionic artifacts from the Runtime APEX.""
am: 0472824d3e

Change-Id: Ifc4865ae42f3cae802197bc4655e204e37258e62

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));
                 }