diff options
| author | Dan Stoza <stoza@google.com> | 2015-05-28 18:26:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-28 18:26:40 +0000 |
| commit | 4808980eecf8f80bf0f033241171bf9075ba74ab (patch) | |
| tree | 465765ace57c77c92d652827fb33da76f40709d7 /services/surfaceflinger/SurfaceFlinger.cpp | |
| parent | e7d9e7fb23e663ca168c5149308bb63a51af6be6 (diff) | |
| parent | f008799d3753e52c10849824ff8146985ea66284 (diff) | |
| download | frameworks_native-4808980eecf8f80bf0f033241171bf9075ba74ab.zip frameworks_native-4808980eecf8f80bf0f033241171bf9075ba74ab.tar.gz frameworks_native-4808980eecf8f80bf0f033241171bf9075ba74ab.tar.bz2 | |
am f008799d: SF: Skip render-to-texture for color transforms
* commit 'f008799d3753e52c10849824ff8146985ea66284':
SF: Skip render-to-texture for color transforms
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index c612026..1388ce8 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1872,9 +1872,9 @@ void SurfaceFlinger::doDisplayComposition(const sp<const DisplayDevice>& hw, if (mDaltonize) { colorMatrix = colorMatrix * mDaltonizer(); } - engine.beginGroup(colorMatrix); + mat4 oldMatrix = engine.setupColorTransform(colorMatrix); doComposeSurfaces(hw, dirtyRegion); - engine.endGroup(); + engine.setupColorTransform(oldMatrix); } // update the swap region and clear the dirty region |