commit 0c4ba8db6545433426714b7c46a28760bbb2a2dc
author Jiyong Park <jiyong@google.com> Thu Apr 04 16:00:26 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 04 16:00:26 2019 -0700
tree a69f3e67b96152376860b05a9d14c36c75c58361
parent 2bc9e9645f547f7905c7d9bea91cd299420e817e
parent a11f06df596792a8cdbf11da8bff4d2b00474da4

Merge "Rename VirtualTouchpadService to IVirtualTouchpadService"
am: a11f06df59

Change-Id: I5af7ba72f02e1955c4c177266ec625dce24c03bc

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