diff options
| author | 2017-03-09 21:53:58 +0000 | |
|---|---|---|
| committer | 2017-03-09 21:53:59 +0000 | |
| commit | 99295a2b1bce6b1031db91b60fb046d5c17fa92c (patch) | |
| tree | fdefa356f4f217b4d5ef9b1d89346987067ac7b7 /cmds/flatland/GLHelper.cpp | |
| parent | 54e1e10afe4bbb4defdaa99a86b156b8e543ffc0 (diff) | |
| parent | 1da94dfed674e94edc37cdc8ef68530520edf169 (diff) | |
Merge changes from topic 'igraphicbufferallocator'
* changes:
get rid of IGraphicBufferAlloc
Remove a dependency of EGL on ui/GraphicBuffer.h
remove EGL dependency on libbinder
Diffstat (limited to 'cmds/flatland/GLHelper.cpp')
| -rw-r--r-- | cmds/flatland/GLHelper.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/flatland/GLHelper.cpp b/cmds/flatland/GLHelper.cpp index 5c04f6cf19..dfc3e581fd 100644 --- a/cmds/flatland/GLHelper.cpp +++ b/cmds/flatland/GLHelper.cpp @@ -25,7 +25,6 @@ namespace android { GLHelper::GLHelper() : - mGraphicBufferAlloc(new GraphicBufferAlloc()), mDisplay(EGL_NO_DISPLAY), mContext(EGL_NO_CONTEXT), mDummySurface(EGL_NO_SURFACE), @@ -203,7 +202,7 @@ bool GLHelper::createNamedSurfaceTexture(GLuint name, uint32_t w, uint32_t h, sp<GLConsumer>* glConsumer, EGLSurface* surface) { sp<IGraphicBufferProducer> producer; sp<IGraphicBufferConsumer> consumer; - BufferQueue::createBufferQueue(&producer, &consumer, mGraphicBufferAlloc); + BufferQueue::createBufferQueue(&producer, &consumer); sp<GLConsumer> glc = new GLConsumer(consumer, name, GL_TEXTURE_EXTERNAL_OES, false, true); glc->setDefaultBufferSize(w, h); |