commit 401b546810cbaa752f7410fa7fad09b1282fcebb
author Jooyung Han <jooyung@google.com> Thu Mar 28 21:54:44 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 28 21:54:44 2019 -0700
tree 6901520f44b58444404be339bd4e3e926203172c
parent e743811c0539e2bc91febe2fc76a4830f1e25208
parent cc4bc6643d4b0083d2b8635826d0e6022cc97d6d

Merge "Mark libandroid_runtime_lazy as double_loadable"
am: cc4bc6643d

Change-Id: Id52d1cfd2b32881df6f4f280e2170de8a1cd2cef

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