commit 445c7b36406aecd467d1444d63add110a320fefc
author Alec Mouri <alecmouri@google.com> Wed Mar 20 23:48:20 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Mar 20 23:48:20 2019 -0700
tree e81b0c1918ae3dffe9101f03f30e5a56e5abadc8
parent c754cfcdc720045940c2e0073e4d3d1f80d5019e
parent 3b14b7db6fb94e2cd812bf15a72723839aa756c4

Merge changes from topic "RenderArea"
am: 3b14b7db6f

Change-Id: I6eea9c398eae9b8f67e20eb115e644bb0f7dd481

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