commit 5f1378fdf013eaf0c6af749155ed2dac70d26481
author Xin Li <delphij@google.com> Tue Mar 12 22:19:33 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 12 22:19:33 2019 -0700
tree 98eeac7c15f12cbb9bd1f0e6c59a8edeaf9056df
parent e052c76c33e8064bbc64e5aa3d29a9bdd9ed78e8
parent 873f49999447c705dac1e1c7537d0a9bdf4d27c0

[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
am: 873f499994 -s ours
am skip reason: subject contains skip directive

Change-Id: I5a5b3e970313b090e759c8d39f655855e8609200

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