commit fca4a38c1864b3a7da1ba2d08a787c3c7ad9b176
author Gavin Corkery <gavincorkery@google.com> Thu Mar 14 07:22:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 14 07:22:04 2019 -0700
tree dbbb1263551871aaeacb9d60c4280aecd305ac06
parent 10fd717a0f11485c999ec64639e2bde0b5fbcd1e
parent 4308cc478da2336bf099b6bfc1cf0f4398ac83b8

Merge "Rename data/pkg_staging to data/app-staging"
am: 4308cc478d

Change-Id: I3c1bfc034350839336395086504f513cd8a71002

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