commit ec1ee7d8a4cd8e1e7b220c68b1be49b9003cd195
author Nandana Dutt <nandana@google.com> Thu Mar 14 10:37:43 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 14 10:37:43 2019 -0700
tree c5727462e0a02572ec1c5e122ec6cc72475b11b9
parent fca4a38c1864b3a7da1ba2d08a787c3c7ad9b176
parent 48159a81be0e8d8804110195d7f3a5fb150c6928

Merge "dumpstate: Log duration only if significant"
am: 48159a81be

Change-Id: Ia273ed733289bcf80bb8f5c2c0543c372ad888ef

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