commit edcecd9ed9087e0c1afb3c0a1fbfda04a0e0a57d
author Steven Moreland <smoreland@google.com> Tue Apr 02 13:15:56 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 02 13:15:56 2019 -0700
tree e9fe809613d6a187907ffaa0f29a3204f75cbe7e
parent 3d8c00e84b705b4797352103e883d18ea04e6af8
parent dc5eade0ccc646982ab317891be86ad992bbea75

Merge "Use binder rather than kernel ONEWAY flag."
am: dc5eade0cc

Change-Id: I3184902e0ac627d9f18f88fea6b714b5917f8860

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