commit 3d8c00e84b705b4797352103e883d18ea04e6af8
author Nick Kralevich <nnk@google.com> Mon Apr 01 11:58:43 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 01 11:58:43 2019 -0700
tree 79e755c10d133915129649f4dcbce3e838a9b635
parent 5aeb884114e79a3cf493c1e0cd3472983fa1e066
parent 72051fdd3519c1c34342239ee0c5c1a10d0bad33

Merge "view_compiler.cpp: clean up file descriptor handling"
am: 72051fdd35

Change-Id: I8b64aa76cd1f835dc38dcdc01ceaaf552695bb2c

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