diff options
author | Mathias Agopian <mathias@google.com> | 2010-12-07 14:22:56 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-07 14:22:56 -0800 |
commit | 4e345ab7df737592528e99db73612c6b37e34545 (patch) | |
tree | 8eded6da95e3c0929209c992c7f0c5db9778508e /services/surfaceflinger/Layer.h | |
parent | a0f011ff499289c89535c41ebe79c8c642414dff (diff) | |
parent | a2977c383d363e1e88a5b36230b1fa4c312807d2 (diff) | |
download | frameworks_base-4e345ab7df737592528e99db73612c6b37e34545.zip frameworks_base-4e345ab7df737592528e99db73612c6b37e34545.tar.gz frameworks_base-4e345ab7df737592528e99db73612c6b37e34545.tar.bz2 |
am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread
* commit 'a2977c383d363e1e88a5b36230b1fa4c312807d2':
[3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[3171580] Add transform field to native buffers. (DO NOT MERGE)
Diffstat (limited to 'services/surfaceflinger/Layer.h')
-rw-r--r-- | services/surfaceflinger/Layer.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index a93fcb1..9ff5716 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -81,6 +81,10 @@ public: virtual sp<Surface> createSurface() const; virtual status_t ditch(); virtual void onRemoved(); + virtual bool setBypass(bool enable); + + inline sp<GraphicBuffer> getBypassBuffer() const { + return mBufferManager.getActiveBuffer(); } // only for debugging inline sp<GraphicBuffer> getBuffer(int i) const { @@ -232,6 +236,7 @@ private: uint32_t mReqFormat; bool mNeedsScaling; bool mFixedSize; + bool mBypassState; }; // --------------------------------------------------------------------------- |