commit 0176bcb1a652194b49ae3a3d61af7bb91bbe92f5
author Steven Moreland <smoreland@google.com> Thu Apr 04 10:26:09 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 04 10:26:09 2019 -0700
tree 082d2a1d698c99018bb727d4ff0f4a9c7a96a1fe
parent 03c10ffd671e68db913a2db79b1b1a6941d1d1c0
parent 0b32b12091dfc96f6ce086850843bc780e2bbf15

Merge "[binder]: Use _IOC_NRMASK instead of oxff to filter out the cmd."
am: 0b32b12091

Change-Id: I2690b304d68659c5ccda129ba7247ad0597fcdf7

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