commit 10fd717a0f11485c999ec64639e2bde0b5fbcd1e
author Martijn Coenen <maco@google.com> Wed Mar 13 05:09:33 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 13 05:09:33 2019 -0700
tree ccb44039e0524c59cbc638ae424b75aa04972015
parent 5f1378fdf013eaf0c6af749155ed2dac70d26481
parent 1f69a63dda1306f046c3b6c3ddb29770979944c7

Merge "Revert "libbinder: Choose the binder driver at runtime based on system/vendor process.""
am: 1f69a63dda

Change-Id: Idcd26a40071e8a81d9d89edb275d61a159d205aa

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