commit 52ea7733448f35ec58310b9cf1c1b492bd31a4e0
author Chia-I Wu <olv@google.com> Wed Oct 17 12:20:31 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 17 12:20:31 2018 -0700
tree 15648f8fb2dab89baa94efb17803f367c36b65f6
parent 8d4a8f2e443cc70613e0604ebabe83d8531a9387
parent 9c325b30d82268398e8b5d690890d224fc9f7eb4

Merge "renderengine: clamp XYZ to [0.0, 1.0] in shaders" am: 45a9d5a9b5
am: 9c325b30d8

Change-Id: I310b5455eef3ffb0639c8f4dd70de5bfd3648701

services/surfaceflinger/RenderEngine/ProgramCache.cpp

diff --git a/services/surfaceflinger/RenderEngine/ProgramCache.cpp b/services/surfaceflinger/RenderEngine/ProgramCache.cpp
index 9dc6858..960b88d 100644
--- a/services/surfaceflinger/RenderEngine/ProgramCache.cpp
+++ b/services/surfaceflinger/RenderEngine/ProgramCache.cpp
@@ -576,7 +576,7 @@
             fs << "uniform mat4 inputTransformMatrix;";
             fs << R"__SHADER__(
                 highp vec3 InputTransform(const highp vec3 color) {
-                    return vec3(inputTransformMatrix * vec4(color, 1.0));
+                    return clamp(vec3(inputTransformMatrix * vec4(color, 1.0)), 0.0, 1.0);
                 }
             )__SHADER__";
         } else {