diff options
| author | Mathias Agopian <mathias@google.com> | 2013-07-16 02:17:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-16 02:17:58 +0000 |
| commit | 7f069d79e7f04192610ef93901c89835fea46444 (patch) | |
| tree | f54b8510204d157278766f302f7088806d6ca942 /cmds | |
| parent | 7556c37b1c1ddd82801bc9ea4cea1ade4d380a98 (diff) | |
| parent | 8f938a53385a3c6d1c6aa24b3f38437bb2cc47ae (diff) | |
| download | frameworks_native-7f069d79e7f04192610ef93901c89835fea46444.zip frameworks_native-7f069d79e7f04192610ef93901c89835fea46444.tar.gz frameworks_native-7f069d79e7f04192610ef93901c89835fea46444.tar.bz2 | |
Merge "always pass the BufferQueue explicitely to consumers"
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/flatland/GLHelper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/flatland/GLHelper.cpp b/cmds/flatland/GLHelper.cpp index 4f7697f..89eb95f 100644 --- a/cmds/flatland/GLHelper.cpp +++ b/cmds/flatland/GLHelper.cpp @@ -199,8 +199,8 @@ bool GLHelper::getShaderProgram(const char* name, GLuint* outPgm) { bool GLHelper::createNamedSurfaceTexture(GLuint name, uint32_t w, uint32_t h, sp<GLConsumer>* glConsumer, EGLSurface* surface) { sp<BufferQueue> bq = new BufferQueue(true, mGraphicBufferAlloc); - sp<GLConsumer> glc = new GLConsumer(name, true, - GL_TEXTURE_EXTERNAL_OES, false, bq); + sp<GLConsumer> glc = new GLConsumer(bq, name, + GL_TEXTURE_EXTERNAL_OES, false); glc->setDefaultBufferSize(w, h); glc->setDefaultMaxBufferCount(3); glc->setConsumerUsageBits(GRALLOC_USAGE_HW_COMPOSER); |