summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-05-13 14:25:50 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-13 14:25:50 -0700
commit143d7ca0dd01877defe10e9f615ba6c76767b8b3 (patch)
treea0c6a36f8f03c9c439320a6d314c6bb96f457dcf
parenta7ed5414e6d768f1b0c0f8bf0871ef59e9b3e86a (diff)
parent9e7f3806dd90dc90057bc1f13c550d2638fe7985 (diff)
downloadnative-143d7ca0dd01877defe10e9f615ba6c76767b8b3.tar.gz
Snap for 5450365 from 94c1d740cfe001e5faf62d3c447c4e1e9f4aa325 to pi-platform-release
am: 9e7f3806dd Change-Id: I07190407c9d7b54aa046109e07c190ce24e492c9
-rw-r--r--services/surfaceflinger/RenderEngine/ProgramCache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/RenderEngine/ProgramCache.cpp b/services/surfaceflinger/RenderEngine/ProgramCache.cpp
index 9dc6858566..46402d5164 100644
--- a/services/surfaceflinger/RenderEngine/ProgramCache.cpp
+++ b/services/surfaceflinger/RenderEngine/ProgramCache.cpp
@@ -220,7 +220,7 @@ void ProgramCache::generateEOTF(Formatter& fs, const Key& needs) {
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));
}