commit cc20457c7b223f4529b9f80b9886992bce9a1b9a
author Andreas Gampe <agampe@google.com> Thu Mar 21 15:03:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 21 15:03:57 2019 -0700
tree 0d851833f39c4104aeac9479b26ced35db779c75
parent 445c7b36406aecd467d1444d63add110a320fefc
parent c684ad61dc09296dde8b2189b1e9d790a7d8cc23

Merge "Fix installd_dexopt_test."
am: c684ad61dc

Change-Id: Ia6d03d6a880647c0ba2e6caf4aee5a7ce83b3eb1

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