diff options
| -rw-r--r-- | libs/gui/SurfaceTexture.cpp | 2 | ||||
| -rw-r--r-- | libs/gui/tests/SurfaceTextureClient_test.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index 2cda4c82db..3cecdb401a 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -271,7 +271,7 @@ status_t SurfaceTexture::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h, if (state == BufferSlot::DEQUEUED) { dequeuedCount++; } - if (state == BufferSlot::FREE || i == mCurrentTexture) { + if (state == BufferSlot::FREE /*|| i == mCurrentTexture*/) { foundSync = i; if (i != mCurrentTexture) { found = i; diff --git a/libs/gui/tests/SurfaceTextureClient_test.cpp b/libs/gui/tests/SurfaceTextureClient_test.cpp index da04b4a3e6..e1a85f3248 100644 --- a/libs/gui/tests/SurfaceTextureClient_test.cpp +++ b/libs/gui/tests/SurfaceTextureClient_test.cpp @@ -505,11 +505,11 @@ TEST_F(SurfaceTextureClientTest, DISABLED_SurfaceTextureSyncModeWaitRetire) { ASSERT_EQ(OK, anw->dequeueBuffer(anw.get(), &buf[0])); ASSERT_EQ(OK, anw->queueBuffer(anw.get(), buf[0])); + thread->run(); ASSERT_EQ(OK, anw->dequeueBuffer(anw.get(), &buf[1])); ASSERT_EQ(OK, anw->queueBuffer(anw.get(), buf[1])); - thread->run(); - ASSERT_EQ(OK, anw->dequeueBuffer(anw.get(), &buf[2])); - ASSERT_EQ(OK, anw->queueBuffer(anw.get(), buf[2])); + //ASSERT_EQ(OK, anw->dequeueBuffer(anw.get(), &buf[2])); + //ASSERT_EQ(OK, anw->queueBuffer(anw.get(), buf[2])); thread->bufferDequeued(); thread->requestExitAndWait(); } |