commit 203201be03e8fe10eadc0237828c83fc80692b74
author Andreas Gampe <agampe@google.com> Mon Mar 25 14:22:50 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Mar 25 14:22:50 2019 -0700
tree 6c572169e53299cb9ed60f99096755832078d242
parent fcaf4ba4c78e0cf1b85041201bf55eb8d676bd73
parent c75833b1d0c0ba1eca1e942a8a11a15fa236a63a

Merge "Installd: Fix installd_dexopt_test"
am: c75833b1d0

Change-Id: I90ccd16474d4e4d6bc7a93dcba16c6b83a803be4

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