commit c754cfcdc720045940c2e0073e4d3d1f80d5019e
author Nandana Dutt <nandana@google.com> Wed Mar 20 11:32:45 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 20 11:32:45 2019 -0700
tree e05cf1ef20a44c3d5ad59965c1e3621d6479cf1b
parent ab8995fc7285618e1401f5a9e94835d57e4c6354
parent 81c1bf02a8a7ca7ed02cd23d6cb87e60e08da787

Merge "dumpstate: remove obsolete TODO"
am: 81c1bf02a8

Change-Id: I0c98b92ce87bbde4d8814621a53e3b417c6cdc21

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