diff options
| author | John Reck <jreck@google.com> | 2014-10-31 23:25:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-31 23:25:44 +0000 |
| commit | e05575e9c36850d8cfe49396ac9a1372511b12bf (patch) | |
| tree | cd106a73af96598499f82ac5dc5fc40dabb3df4a /libs/hwui/renderthread/EglManager.h | |
| parent | 58f2a1e8a47de6c3ce4f588b07fc052f4687492d (diff) | |
| parent | a51fba0bf037844bcb911e69e8af733e6d2cccf6 (diff) | |
| download | frameworks_base-e05575e9c36850d8cfe49396ac9a1372511b12bf.zip frameworks_base-e05575e9c36850d8cfe49396ac9a1372511b12bf.tar.gz frameworks_base-e05575e9c36850d8cfe49396ac9a1372511b12bf.tar.bz2 | |
am a8d83d63: Merge "Layer changes" into lmp-mr1-dev
automerge: a51fba0
* commit 'a51fba0bf037844bcb911e69e8af733e6d2cccf6':
Layer changes
Diffstat (limited to 'libs/hwui/renderthread/EglManager.h')
| -rw-r--r-- | libs/hwui/renderthread/EglManager.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libs/hwui/renderthread/EglManager.h b/libs/hwui/renderthread/EglManager.h index ae03ea1..e12db3a 100644 --- a/libs/hwui/renderthread/EglManager.h +++ b/libs/hwui/renderthread/EglManager.h @@ -48,6 +48,7 @@ public: bool makeCurrent(EGLSurface surface); void beginFrame(EGLSurface surface, EGLint* width, EGLint* height); bool swapBuffers(EGLSurface surface); + void cancelFrame(); // Returns true iff the surface is now preserving buffers. bool setPreserveBuffer(EGLSurface surface, bool preserve); @@ -80,6 +81,12 @@ private: sp<GraphicBuffer> mAtlasBuffer; int64_t* mAtlasMap; size_t mAtlasMapSize; + + // Whether or not we are in the middle of drawing a frame. This is used + // to avoid switching surfaces mid-frame if requireGlContext() is called + // TODO: Need to be better about surface/context management so that this isn't + // necessary + bool mInFrame; }; } /* namespace renderthread */ |