summaryrefslogtreecommitdiff
path: root/cmds/flatland/GLHelper.cpp
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2013-07-20 01:02:47 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-07-20 01:02:47 +0000
commitbdce8170479d0efb548514c1a290e1bfea711cfd (patch)
tree7cd97ee1e8d8842e3d229a531975f43f4502c75e /cmds/flatland/GLHelper.cpp
parente5bb2a45e0861c7ed953373f86afe44f255f021c (diff)
parent26a6f37cc06b8014edcedbee8d5558ca7da9abe3 (diff)
Merge changes Ic45929f3,Ic63f4f96,I1e703d36,I691f9507
* changes: make sure to reset the framenumber when a buffer is marked FREE Make ANW.setSwapInterval(0) work again BuffferQueue disconnect is now always asynchrnous BufferQueue improvements and APIs changes
Diffstat (limited to 'cmds/flatland/GLHelper.cpp')
-rw-r--r--cmds/flatland/GLHelper.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/flatland/GLHelper.cpp b/cmds/flatland/GLHelper.cpp
index 89eb95fd92..3928039505 100644
--- a/cmds/flatland/GLHelper.cpp
+++ b/cmds/flatland/GLHelper.cpp
@@ -198,7 +198,7 @@ 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<BufferQueue> bq = new BufferQueue(mGraphicBufferAlloc);
sp<GLConsumer> glc = new GLConsumer(bq, name,
GL_TEXTURE_EXTERNAL_OES, false);
glc->setDefaultBufferSize(w, h);