diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-13 00:29:07 -0800 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-02-15 00:22:06 +0000 |
| commit | 4cd7227b78773fbd201bee4627b55f4008e961e7 (patch) | |
| tree | 4a79f588318cff97038aa91eaa46469989518867 /services/surfaceflinger/DisplayHardware/HWComposer.cpp | |
| parent | be1b7537097779385da94ae98e0cca76732d74ba (diff) | |
| parent | 529cb9ed9c5d62d5b270cdd650380ae116382143 (diff) | |
| download | frameworks_native-4cd7227b78773fbd201bee4627b55f4008e961e7.zip frameworks_native-4cd7227b78773fbd201bee4627b55f4008e961e7.tar.gz frameworks_native-4cd7227b78773fbd201bee4627b55f4008e961e7.tar.bz2 | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/native into 1.1
Android 4.2.2 release 1
Conflicts:
libs/ui/GraphicBufferAllocator.cpp
Change-Id: Id60a6580bf5a3ba04f8e1e2b1b950e0b93888166
Diffstat (limited to 'services/surfaceflinger/DisplayHardware/HWComposer.cpp')
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 379fb16..3ed8d97 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -1000,6 +1000,9 @@ public: getLayer()->visibleRegionScreen.numRects = 0; getLayer()->visibleRegionScreen.rects = NULL; } + virtual void setPerFrameDefaultState() { + //getLayer()->compositionType = HWC_FRAMEBUFFER; + } virtual void setSkip(bool skip) { if (skip) { getLayer()->flags |= HWC_SKIP_LAYER; @@ -1073,7 +1076,9 @@ public: virtual void setAcquireFenceFd(int fenceFd) { getLayer()->acquireFenceFd = fenceFd; } - + virtual void setPerFrameDefaultState() { + //getLayer()->compositionType = HWC_FRAMEBUFFER; + } virtual void setDefaultState() { getLayer()->compositionType = HWC_FRAMEBUFFER; getLayer()->hints = 0; |