diff options
| author | Chia-I Wu <olv@google.com> | 2018-10-17 12:16:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-17 12:16:17 -0700 |
| commit | 9c325b30d82268398e8b5d690890d224fc9f7eb4 (patch) | |
| tree | 322b3486accda763d100d89d94eb7cdd2bac15bd | |
| parent | b56737d4c07a0733b6b3f126e42759ae2112f5d0 (diff) | |
| parent | 45a9d5a9b56c50195116f828d639ccec27f88d59 (diff) | |
| download | native-9c325b30d82268398e8b5d690890d224fc9f7eb4.tar.gz | |
Merge "renderengine: clamp XYZ to [0.0, 1.0] in shaders"
am: 45a9d5a9b5
Change-Id: Id54ef84acc7b5e7b273ab345eae6383dae355ba2
| -rw-r--r-- | services/surfaceflinger/RenderEngine/ProgramCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/RenderEngine/ProgramCache.cpp b/services/surfaceflinger/RenderEngine/ProgramCache.cpp index 9dc6858566..960b88dc9e 100644 --- a/services/surfaceflinger/RenderEngine/ProgramCache.cpp +++ b/services/surfaceflinger/RenderEngine/ProgramCache.cpp @@ -576,7 +576,7 @@ String8 ProgramCache::generateFragmentShader(const Key& needs) { 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 { |