diff options
| author | John Reck <jreck@google.com> | 2014-10-31 14:49:06 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-10-31 15:30:10 -0700 |
| commit | 0e89e2b7bcb2c035e8cee77f93120e7c5617f8d2 (patch) | |
| tree | 8fcd1f768f08fbeb2cd13425a2bf15b7670428f2 /libs/hwui/renderthread/EglManager.h | |
| parent | 141823ec6313d9545b8354ea1e3e017a1da3cfa8 (diff) | |
Layer changes
Bug: 17208461
* Switch Layer to be VirtualLightRefBase instead of
Caches' side-channel ref-counting
* Include active layers in gfxinfo dump
* Run gfxinfo dump on the correct thread
* Dump gfxinfo on Layer creation failure
Change-Id: I28d195699e2334518e215ab28c7a17355aee9678
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 ae03ea1fc3b8..e12db3acbe2f 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 */ |