summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-12-03 00:10:12 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-12-03 00:10:12 +0000
commit73a2a418731c5d0064c38ba3488f095609d53635 (patch)
treeaf9ccdf32653250541fd8fdfc37c4bd745835a1a
parent01a3ab6119f9b873c5f6f1c9b2d3b3728a2bc177 (diff)
parent87195fec3e889dcde7ee9210eaf7ed3378af9284 (diff)
downloadnative-73a2a418731c5d0064c38ba3488f095609d53635.tar.gz
Merge cherrypicks of [5678594, 5678595, 5678596, 5675496, 5675497, 5678860, 5678897, 5665877, 5665878, 5678939, 5678940, 5678941, 5678942, 5678943, 5678944, 5678945, 5675449, 5678034, 5678597] into pi-b4s4-release
Change-Id: I768f749b4faccc39c928a2e969985028555350b2
-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..338d27c2e4 100644
--- a/services/surfaceflinger/RenderEngine/ProgramCache.cpp
+++ b/services/surfaceflinger/RenderEngine/ProgramCache.cpp
@@ -611,7 +611,7 @@ String8 ProgramCache::generateFragmentShader(const Key& needs) {
fs << "void main(void) {" << indent;
if (needs.isTexturing()) {
- fs << "gl_FragColor = texture2D(sampler, outTexCoords);";
+ fs << "gl_FragColor = clamp(texture2D(sampler, outTexCoords), 0.0, 1.0);";
if (needs.isY410BT2020()) {
fs << "gl_FragColor.rgb = convertY410BT2020(gl_FragColor.rgb);";
}