diff options
| author | Erik Gilling <konkers@android.com> | 2010-09-09 13:01:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-09 13:01:23 -0700 |
| commit | 4b95ea0153770c664d5cb3744cd33ba2b238b0c6 (patch) | |
| tree | af5c4e9aaa97d52fe4cb8f5caa49b1d51dc429a5 | |
| parent | 1d3fc50ac04bc0717d4cc965b208abe73a62da34 (diff) | |
| parent | 982f58bdccce7e4e537cffb2410ad78d73398461 (diff) | |
| download | frameworks_base-4b95ea0153770c664d5cb3744cd33ba2b238b0c6.zip frameworks_base-4b95ea0153770c664d5cb3744cd33ba2b238b0c6.tar.gz frameworks_base-4b95ea0153770c664d5cb3744cd33ba2b238b0c6.tar.bz2 | |
Merge "surfaceflinger: composite HWC_SKIP_LAYER layers"
| -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 83f96a6..d820380 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -885,8 +885,8 @@ void SurfaceFlinger::composeSurfaces(const Region& dirty) */ for (size_t i=0 ; i<count ; i++) { if (cur) { - if (!(cur[i].compositionType == HWC_FRAMEBUFFER) || - cur[i].flags & HWC_SKIP_LAYER) { + if ((cur[i].compositionType != HWC_FRAMEBUFFER) && + !(cur[i].flags & HWC_SKIP_LAYER)) { // skip layers handled by the HAL continue; } |