commit 747c01e150b3f17eb4741a7dbb5191fb96b62ae9
author Siarhei Vishniakou <svv@google.com> Thu Apr 25 09:44:29 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 25 09:44:29 2019 -0700
tree 7866cd5eea1649a0ac394fc0de0af046dd54f690
parent 314c95e822f0c58ec3e9e0300c75dc0ad08fb6c3
parent 181e024f3dc312c2666b07c544d58c128976d7e4

Merge changes I843fd9ef,Ife0a5721,I18b28a3a,I4439342c,Id8b870b6
am: 181e024f3d

Change-Id: I6e40e192829bfadced8e047c1134c3e0727e3e81

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