BQ: fix Volantis test failures
The Volantis driver will dequeue a buffer in eglCreateWindowSurface.
- Remove the requirement that no buffers be dequeued when calling
setAsyncMode() on a BufferQueueProducer, since this gets called
from eglSwapInterval.
- Modify the tests to call setMaxDequeuedBufferCount before calling
eglCreateWindowSurface.
Change-Id: Icc64e9933f151771bbd57035549cd5928c0b7216
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index deec330..0cb018c 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -159,14 +159,6 @@
return NO_INIT;
}
- // There must be no dequeued buffers when changing the async mode.
- for (int s = 0; s < BufferQueueDefs::NUM_BUFFER_SLOTS; ++s) {
- if (mSlots[s].mBufferState == BufferSlot::DEQUEUED) {
- BQ_LOGE("setAsyncMode: buffer owned by producer");
- return BAD_VALUE;
- }
- }
-
if ((mCore->mMaxAcquiredBufferCount + mCore->mMaxDequeuedBufferCount +
(async || mCore->mDequeueBufferCannotBlock ? 1 : 0)) >
mCore->mMaxBufferCount) {
diff --git a/libs/gui/tests/IGraphicBufferProducer_test.cpp b/libs/gui/tests/IGraphicBufferProducer_test.cpp
index 7455cd9..882b14c 100644
--- a/libs/gui/tests/IGraphicBufferProducer_test.cpp
+++ b/libs/gui/tests/IGraphicBufferProducer_test.cpp
@@ -616,10 +616,6 @@
TEST_PRODUCER_USAGE_BITS))) << "slot: " << dequeuedSlot;
}
- // Client has one or more buffers dequeued
- EXPECT_EQ(BAD_VALUE, mProducer->setAsyncMode(false)) << "asyncMode: "
- << false;
-
// Abandon buffer queue
ASSERT_OK(mConsumer->consumerDisconnect());
diff --git a/libs/gui/tests/SurfaceTextureGLThreadToGL_test.cpp b/libs/gui/tests/SurfaceTextureGLThreadToGL_test.cpp
index b4e25f3..c4d0aaa 100644
--- a/libs/gui/tests/SurfaceTextureGLThreadToGL_test.cpp
+++ b/libs/gui/tests/SurfaceTextureGLThreadToGL_test.cpp
@@ -31,6 +31,8 @@
}
};
+ SetUpWindowAndContext();
+
runProducerThread(new PT());
mFC->waitForFrame();
@@ -50,6 +52,8 @@
}
};
+ SetUpWindowAndContext();
+
runProducerThread(new PT());
mFC->waitForFrame();
@@ -75,6 +79,8 @@
}
};
+ SetUpWindowAndContext();
+
runProducerThread(new PT());
for (int i = 0; i < NUM_ITERATIONS; i++) {
@@ -104,6 +110,8 @@
}
};
+ SetUpWindowAndContext();
+
runProducerThread(new PT());
for (int i = 0; i < NUM_ITERATIONS; i++) {
@@ -134,6 +142,8 @@
}
};
+ SetUpWindowAndContext();
+
runProducerThread(new PT());
// Allow three frames to be rendered and queued before starting the
diff --git a/libs/gui/tests/SurfaceTextureGLToGL.h b/libs/gui/tests/SurfaceTextureGLToGL.h
index 5a2eff3..5d43a48 100644
--- a/libs/gui/tests/SurfaceTextureGLToGL.h
+++ b/libs/gui/tests/SurfaceTextureGLToGL.h
@@ -34,7 +34,9 @@
virtual void SetUp() {
SurfaceTextureGLTest::SetUp();
+ }
+ void SetUpWindowAndContext() {
mProducerEglSurface = eglCreateWindowSurface(mEglDisplay, mGlConfig,
mANW.get(), NULL);
ASSERT_EQ(EGL_SUCCESS, eglGetError());
diff --git a/libs/gui/tests/SurfaceTextureGLToGL_test.cpp b/libs/gui/tests/SurfaceTextureGLToGL_test.cpp
index b3f6066..c28b4d1 100644
--- a/libs/gui/tests/SurfaceTextureGLToGL_test.cpp
+++ b/libs/gui/tests/SurfaceTextureGLToGL_test.cpp
@@ -33,6 +33,8 @@
// to 2, and max acquired already defaults to 1.
ASSERT_EQ(OK, mSTC->setMaxDequeuedBufferCount(2));
+ SetUpWindowAndContext();
+
// Do the producer side of things
EXPECT_TRUE(eglMakeCurrent(mEglDisplay, mProducerEglSurface,
mProducerEglSurface, mProducerEglContext));
@@ -85,6 +87,8 @@
// Set max dequeued to 2, and max acquired already defaults to 1.
ASSERT_EQ(OK, mSTC->setMaxDequeuedBufferCount(2));
+ SetUpWindowAndContext();
+
// Do the producer side of things
EXPECT_TRUE(eglMakeCurrent(mEglDisplay, mProducerEglSurface,
mProducerEglSurface, mProducerEglContext));
@@ -152,6 +156,7 @@
}
TEST_F(SurfaceTextureGLToGLTest, EglDestroySurfaceUnrefsBuffers) {
+ SetUpWindowAndContext();
sp<GraphicBuffer> buffers[2];
// This test requires async mode to run on a single thread.
@@ -197,6 +202,7 @@
}
TEST_F(SurfaceTextureGLToGLTest, EglDestroySurfaceAfterAbandonUnrefsBuffers) {
+ SetUpWindowAndContext();
sp<GraphicBuffer> buffers[3];
// This test requires async mode to run on a single thread.
@@ -254,6 +260,7 @@
}
TEST_F(SurfaceTextureGLToGLTest, EglMakeCurrentBeforeConsumerDeathUnrefsBuffers) {
+ SetUpWindowAndContext();
sp<GraphicBuffer> buffer;
EXPECT_TRUE(eglMakeCurrent(mEglDisplay, mProducerEglSurface,
@@ -291,6 +298,7 @@
}
TEST_F(SurfaceTextureGLToGLTest, EglMakeCurrentAfterConsumerDeathUnrefsBuffers) {
+ SetUpWindowAndContext();
sp<GraphicBuffer> buffer;
EXPECT_TRUE(eglMakeCurrent(mEglDisplay, mProducerEglSurface,
@@ -335,6 +343,8 @@
// Set max dequeued to 2, and max acquired already defaults to 1.
ASSERT_EQ(OK, mSTC->setMaxDequeuedBufferCount(2));
+ SetUpWindowAndContext();
+
// Set the user buffer size.
native_window_set_buffers_user_dimensions(mANW.get(), texWidth, texHeight);
@@ -393,6 +403,8 @@
// Set max dequeued to 2, and max acquired already defaults to 1.
ASSERT_EQ(OK, mSTC->setMaxDequeuedBufferCount(2));
+ SetUpWindowAndContext();
+
// Set the transform hint.
mST->setTransformHint(NATIVE_WINDOW_TRANSFORM_ROT_90);
@@ -455,6 +467,8 @@
// Set max dequeued to 2, and max acquired already defaults to 1.
ASSERT_EQ(OK, mSTC->setMaxDequeuedBufferCount(2));
+ SetUpWindowAndContext();
+
// Set the transform hint.
mST->setTransformHint(NATIVE_WINDOW_TRANSFORM_ROT_90);