Eliminate requireGlContext
Bug: 20297820
Change-Id: I37c63bab6f6c0d2337c8c6002046d2ef17e74097
diff --git a/libs/hwui/renderthread/EglManager.h b/libs/hwui/renderthread/EglManager.h
index 0855516..8881de6 100644
--- a/libs/hwui/renderthread/EglManager.h
+++ b/libs/hwui/renderthread/EglManager.h
@@ -36,9 +36,7 @@
void initialize();
bool hasEglContext();
- void requireGlContext();
- void usePBufferSurface();
EGLSurface createSurface(EGLNativeWindowType window);
void destroySurface(EGLSurface surface);
@@ -49,7 +47,6 @@
bool makeCurrent(EGLSurface surface);
void beginFrame(EGLSurface surface, EGLint* width, EGLint* height);
bool swapBuffers(EGLSurface surface, const SkRect& dirty, EGLint width, EGLint height);
- void cancelFrame();
// Returns true iff the surface is now preserving buffers.
bool setPreserveBuffer(EGLSurface surface, bool preserve);
@@ -65,6 +62,7 @@
// EglContext is never destroyed, method is purposely not implemented
~EglManager();
+ void createPBufferSurface();
void loadConfig();
void createContext();
void initAtlas();
@@ -84,12 +82,6 @@
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 */