commit bc28462b5afeff9bc312b18a9b83e39c20b6d243
author Steven Moreland <smoreland@google.com> Tue Apr 02 13:17:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 02 13:17:42 2019 -0700
tree aa8c51ace29282022bdbf14b9473a6fe01f16429
parent edcecd9ed9087e0c1afb3c0a1fbfda04a0e0a57d
parent a9ed1a6486545ffc5bffca561d6f8991e7d5a578

Merge "libbinder: Remove unused type: small_flat_data"
am: a9ed1a6486

Change-Id: I4053c9edf7c920de1d34b3b5806cfd27ce816577

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