commit e63a8b8a71e681310c35fae8e1dd3920d9d07326
author Andreas Gampe <agampe@google.com> Sun Mar 24 13:06:03 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sun Mar 24 13:06:03 2019 -0700
tree 7d9de340501404387fd5b156aef22e4f3cbfe350
parent b0c2c266b6b2d738559d4136512d66d3eea957fc
parent 2c0b5118c35867d49fd66dd32ee211b32b45cd31

Merge changes from topic "agampe:a-b-ota:vendor-product-logical-partitions"
am: 2c0b5118c3

Change-Id: I877a2eb1f00ba520287f6add55eb942d56893eb6

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