diff options
| author | Mathias Agopian <mathias@google.com> | 2012-09-05 16:00:56 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-09-05 16:52:03 -0700 |
| commit | 2cf855fbef641abdda69abe39005ea3d6c7830f0 (patch) | |
| tree | a09f1c2e39bdb41c28823a1b64bc7da2d0cf00d1 | |
| parent | c3026f7ac9a8c13b29511ba885deb3b7919d4202 (diff) | |
| download | frameworks_native-2cf855fbef641abdda69abe39005ea3d6c7830f0.zip frameworks_native-2cf855fbef641abdda69abe39005ea3d6c7830f0.tar.gz frameworks_native-2cf855fbef641abdda69abe39005ea3d6c7830f0.tar.bz2 | |
fix a problem where all hwc layers would have the SKIP flags set
the problem was that LayerBase::setPerFrameData() was always setting
this flag. in fact there was no reason to do this at that point since
the layer is initialized to a default state in setGeometry().
Bug: 7111259
Change-Id: Ib37b0dd7391a6163070e9aca025512159c1705f9
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 1 | ||||
| -rw-r--r-- | services/surfaceflinger/LayerBase.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 23290e3..0034019 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -546,6 +546,7 @@ public: getLayer()->compositionType = HWC_FRAMEBUFFER; getLayer()->hints = 0; getLayer()->flags = HWC_SKIP_LAYER; + getLayer()->handle = 0; getLayer()->transform = 0; getLayer()->blending = HWC_BLENDING_NONE; getLayer()->visibleRegionScreen.numRects = 0; diff --git a/services/surfaceflinger/LayerBase.cpp b/services/surfaceflinger/LayerBase.cpp index 87dc572..311d95f 100644 --- a/services/surfaceflinger/LayerBase.cpp +++ b/services/surfaceflinger/LayerBase.cpp @@ -292,7 +292,6 @@ void LayerBase::setGeometry( void LayerBase::setPerFrameData(const sp<const DisplayDevice>& hw, HWComposer::HWCLayerInterface& layer) { - layer.setBuffer(0); // we have to set the visible region on every frame because // we currently free it during onLayerDisplayed(), which is called // after HWComposer::commit() -- every frame. |