diff options
| author | John Reck <jreck@google.com> | 2014-10-31 23:00:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 23:00:44 +0000 |
| commit | a51fba0bf037844bcb911e69e8af733e6d2cccf6 (patch) | |
| tree | 1b6027c164bfebbb15618ae82233833a4c807397 /libs/hwui/renderthread/EglManager.h | |
| parent | 18163616c80aa30f4b7389838d8658812615080c (diff) | |
| parent | a8d83d639a5687b2ab5689db4ea61e2a6cce66f4 (diff) | |
| download | frameworks_base-a51fba0bf037844bcb911e69e8af733e6d2cccf6.zip frameworks_base-a51fba0bf037844bcb911e69e8af733e6d2cccf6.tar.gz frameworks_base-a51fba0bf037844bcb911e69e8af733e6d2cccf6.tar.bz2 | |
am a8d83d63: Merge "Layer changes" into lmp-mr1-dev
* commit 'a8d83d639a5687b2ab5689db4ea61e2a6cce66f4':
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 */ |