ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove deprecated BufferQueue constructor 

Bug: 13415624
Change-Id: I153b5470b21832cebe3c617d28a4ab9c9bf3b362
This commit is contained in:
Dan Stoza 2014-04-07 13:41:37 -07:00
parent fc9aeb8590
commit 5603a2fbbd
9 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/gui/tests/CpuConsumer_test.cpp
View File

@ -64,11 +64,13 @@ protected:
test_info->name(), test_info->name(),
params.width, params.height, params.width, params.height,
params.maxLockedBuffers, params.format); params.maxLockedBuffers, params.format);
sp<BufferQueue> bq = new BufferQueue(); sp<IGraphicBufferProducer> producer;
mCC = new CpuConsumer(bq, params.maxLockedBuffers); sp<IGraphicBufferConsumer> consumer;
BufferQueue::createBufferQueue(&producer, &consumer);
mCC = new CpuConsumer(consumer, params.maxLockedBuffers);
String8 name("CpuConsumer_Under_Test"); String8 name("CpuConsumer_Under_Test");
mCC->setName(name); mCC->setName(name);
mSTC = new Surface(bq); mSTC = new Surface(producer);
mANW = mSTC; mANW = mSTC;
} }

5
libs/gui/tests/IGraphicBufferProducer_test.cpp
View File

@ -80,11 +80,9 @@ protected:
ALOGV("Begin test: %s.%s", testInfo->test_case_name(), ALOGV("Begin test: %s.%s", testInfo->test_case_name(),
testInfo->name()); testInfo->name());
mBQ = new BufferQueue();
mDC = new DummyConsumer; mDC = new DummyConsumer;
mProducer = mBQ; BufferQueue::createBufferQueue(&mProducer, &mConsumer);
mConsumer = mBQ;
// Test check: Can't connect producer if no consumer yet // Test check: Can't connect producer if no consumer yet
ASSERT_EQ(NO_INIT, TryConnectProducer()); ASSERT_EQ(NO_INIT, TryConnectProducer());
@ -201,7 +199,6 @@ protected:
} }
private: // hide from test body private: // hide from test body
sp<BufferQueue> mBQ;
sp<DummyConsumer> mDC; sp<DummyConsumer> mDC;
protected: // accessible from test body protected: // accessible from test body

8
libs/gui/tests/MultiTextureConsumer_test.cpp
View File

@ -34,9 +34,11 @@ protected:
virtual void SetUp() { virtual void SetUp() {
GLTest::SetUp(); GLTest::SetUp();
sp<BufferQueue> bq = new BufferQueue(); sp<IGraphicBufferProducer> producer;
mGlConsumer = new GLConsumer(bq, TEX_ID); sp<IGraphicBufferConsumer> consumer;
mSurface = new Surface(bq); BufferQueue::createBufferQueue(&producer, &consumer);
mGlConsumer = new GLConsumer(consumer, TEX_ID);
mSurface = new Surface(producer);
mANW = mSurface.get(); mANW = mSurface.get();
} }

11
libs/gui/tests/SRGB_test.cpp
View File

@ -68,13 +68,15 @@ protected:
} }
virtual void SetUp() { virtual void SetUp() {
mBufferQueue = new BufferQueue(); sp<IGraphicBufferProducer> producer;
ASSERT_EQ(NO_ERROR, mBufferQueue->setDefaultBufferSize( sp<IGraphicBufferConsumer> consumer;
BufferQueue::createBufferQueue(&producer, &consumer);
ASSERT_EQ(NO_ERROR, consumer->setDefaultBufferSize(
DISPLAY_WIDTH, DISPLAY_HEIGHT)); DISPLAY_WIDTH, DISPLAY_HEIGHT));
mCpuConsumer = new CpuConsumer(mBufferQueue, 1); mCpuConsumer = new CpuConsumer(consumer, 1);
String8 name("CpuConsumer_for_SRGBTest"); String8 name("CpuConsumer_for_SRGBTest");
mCpuConsumer->setName(name); mCpuConsumer->setName(name);
mInputSurface = new Surface(mBufferQueue); mInputSurface = new Surface(producer);
ASSERT_NO_FATAL_FAILURE(createEGLSurface(mInputSurface.get())); ASSERT_NO_FATAL_FAILURE(createEGLSurface(mInputSurface.get()));
ASSERT_NO_FATAL_FAILURE(createDebugSurface()); ASSERT_NO_FATAL_FAILURE(createDebugSurface());
@ -222,7 +224,6 @@ protected:
} }
// Primary producer and consumer // Primary producer and consumer
sp<BufferQueue> mBufferQueue;
sp<Surface> mInputSurface; sp<Surface> mInputSurface;
sp<CpuConsumer> mCpuConsumer; sp<CpuConsumer> mCpuConsumer;
CpuConsumer::LockedBuffer mLockedBuffer; CpuConsumer::LockedBuffer mLockedBuffer;

16
libs/gui/tests/SurfaceTextureClient_test.cpp
View File

@ -43,9 +43,11 @@ protected:
ALOGV("Begin test: %s.%s", testInfo->test_case_name(), ALOGV("Begin test: %s.%s", testInfo->test_case_name(),
testInfo->name()); testInfo->name());
sp<BufferQueue> bq = new BufferQueue(); sp<IGraphicBufferProducer> producer;
mST = new GLConsumer(bq, 123); sp<IGraphicBufferConsumer> consumer;
mSTC = new Surface(bq); BufferQueue::createBufferQueue(&producer, &consumer);
mST = new GLConsumer(consumer, 123);
mSTC = new Surface(producer);
mANW = mSTC; mANW = mSTC;
// We need a valid GL context so we can test updateTexImage() // We need a valid GL context so we can test updateTexImage()
@ -711,9 +713,11 @@ protected:
ASSERT_NE(EGL_NO_CONTEXT, mEglContext); ASSERT_NE(EGL_NO_CONTEXT, mEglContext);
for (int i = 0; i < NUM_SURFACE_TEXTURES; i++) { for (int i = 0; i < NUM_SURFACE_TEXTURES; i++) {
sp<BufferQueue> bq = new BufferQueue(); sp<IGraphicBufferProducer> producer;
sp<GLConsumer> st(new GLConsumer(bq, i)); sp<IGraphicBufferConsumer> consumer;
sp<Surface> stc(new Surface(bq)); BufferQueue::createBufferQueue(&producer, &consumer);
sp<GLConsumer> st(new GLConsumer(consumer, i));
sp<Surface> stc(new Surface(producer));
mEglSurfaces[i] = eglCreateWindowSurface(mEglDisplay, myConfig, mEglSurfaces[i] = eglCreateWindowSurface(mEglDisplay, myConfig,
static_cast<ANativeWindow*>(stc.get()), NULL); static_cast<ANativeWindow*>(stc.get()), NULL);
ASSERT_EQ(EGL_SUCCESS, eglGetError()); ASSERT_EQ(EGL_SUCCESS, eglGetError());

10
libs/gui/tests/SurfaceTextureGL.h
View File

@ -37,10 +37,10 @@ protected:
void SetUp() { void SetUp() {
GLTest::SetUp(); GLTest::SetUp();
sp<BufferQueue> bq = new BufferQueue(); sp<IGraphicBufferProducer> producer;
mBQ = bq; BufferQueue::createBufferQueue(&producer, &mConsumer);
mST = new GLConsumer(bq, TEX_ID); mST = new GLConsumer(mConsumer, TEX_ID);
mSTC = new Surface(bq); mSTC = new Surface(producer);
mANW = mSTC; mANW = mSTC;
mTextureRenderer = new TextureRenderer(TEX_ID, mST); mTextureRenderer = new TextureRenderer(TEX_ID, mST);
ASSERT_NO_FATAL_FAILURE(mTextureRenderer->SetUp()); ASSERT_NO_FATAL_FAILURE(mTextureRenderer->SetUp());
@ -60,7 +60,7 @@ protected:
mTextureRenderer->drawTexture(); mTextureRenderer->drawTexture();
} }
sp<BufferQueue> mBQ; sp<IGraphicBufferConsumer> mConsumer;
sp<GLConsumer> mST; sp<GLConsumer> mST;
sp<Surface> mSTC; sp<Surface> mSTC;
sp<ANativeWindow> mANW; sp<ANativeWindow> mANW;

2
libs/gui/tests/SurfaceTextureGL_test.cpp
View File

@ -451,7 +451,7 @@ TEST_F(SurfaceTextureGLTest, DisconnectStressTest) {
}; };
sp<DisconnectWaiter> dw(new DisconnectWaiter()); sp<DisconnectWaiter> dw(new DisconnectWaiter());
mBQ->consumerConnect(dw, false); mConsumer->consumerConnect(dw, false);
sp<Thread> pt(new ProducerThread(mANW)); sp<Thread> pt(new ProducerThread(mANW));

18
libs/gui/tests/Surface_test.cpp
View File

@ -88,11 +88,13 @@ TEST_F(SurfaceTest, ScreenshotsOfProtectedBuffersSucceed) {
sp<ANativeWindow> anw(mSurface); sp<ANativeWindow> anw(mSurface);
// Verify the screenshot works with no protected buffers. // Verify the screenshot works with no protected buffers.
sp<BufferQueue> bq = new BufferQueue(); sp<IGraphicBufferProducer> producer;
sp<CpuConsumer> consumer = new CpuConsumer(bq, 1); sp<IGraphicBufferConsumer> consumer;
BufferQueue::createBufferQueue(&producer, &consumer);
sp<CpuConsumer> cpuConsumer = new CpuConsumer(consumer, 1);
sp<ISurfaceComposer> sf(ComposerService::getComposerService()); sp<ISurfaceComposer> sf(ComposerService::getComposerService());
sp<IBinder> display(sf->getBuiltInDisplay(ISurfaceComposer::eDisplayIdMain)); sp<IBinder> display(sf->getBuiltInDisplay(ISurfaceComposer::eDisplayIdMain));
ASSERT_EQ(NO_ERROR, sf->captureScreen(display, bq, ASSERT_EQ(NO_ERROR, sf->captureScreen(display, producer,
64, 64, 0, 0x7fffffff, false)); 64, 64, 0, 0x7fffffff, false));
// Set the PROTECTED usage bit and verify that the screenshot fails. Note // Set the PROTECTED usage bit and verify that the screenshot fails. Note
@ -121,7 +123,7 @@ TEST_F(SurfaceTest, ScreenshotsOfProtectedBuffersSucceed) {
&buf)); &buf));
ASSERT_EQ(NO_ERROR, anw->queueBuffer(anw.get(), buf, -1)); ASSERT_EQ(NO_ERROR, anw->queueBuffer(anw.get(), buf, -1));
} }
ASSERT_EQ(NO_ERROR, sf->captureScreen(display, bq, ASSERT_EQ(NO_ERROR, sf->captureScreen(display, producer,
64, 64, 0, 0x7fffffff, false)); 64, 64, 0, 0x7fffffff, false));
} }
@ -136,10 +138,12 @@ TEST_F(SurfaceTest, ConcreteTypeIsSurface) {
TEST_F(SurfaceTest, QueryConsumerUsage) { TEST_F(SurfaceTest, QueryConsumerUsage) {
const int TEST_USAGE_FLAGS = const int TEST_USAGE_FLAGS =
GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_HW_RENDER; GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_HW_RENDER;
sp<BufferQueue> bq = new BufferQueue(); sp<IGraphicBufferProducer> producer;
sp<BufferItemConsumer> c = new BufferItemConsumer(bq, sp<IGraphicBufferConsumer> consumer;
BufferQueue::createBufferQueue(&producer, &consumer);
sp<BufferItemConsumer> c = new BufferItemConsumer(consumer,
TEST_USAGE_FLAGS); TEST_USAGE_FLAGS);
sp<Surface> s = new Surface(bq); sp<Surface> s = new Surface(producer);
sp<ANativeWindow> anw(s); sp<ANativeWindow> anw(s);

8
opengl/tests/EGLTest/EGL_test.cpp
View File

@ -107,9 +107,11 @@ TEST_F(EGLTest, EGLTerminateSucceedsWithRemainingObjects) {
}; };
// Create a EGLSurface // Create a EGLSurface
sp<BufferQueue> bq = new BufferQueue(); sp<IGraphicBufferProducer> producer;
bq->consumerConnect(new DummyConsumer, false); sp<IGraphicBufferConsumer> consumer;
sp<Surface> mSTC = new Surface(static_cast<sp<IGraphicBufferProducer> >( bq)); BufferQueue::createBufferQueue(&producer, &consumer);
consumer->consumerConnect(new DummyConsumer, false);
sp<Surface> mSTC = new Surface(producer);
sp<ANativeWindow> mANW = mSTC; sp<ANativeWindow> mANW = mSTC;
EGLSurface eglSurface = eglCreateWindowSurface(mEglDisplay, config, EGLSurface eglSurface = eglCreateWindowSurface(mEglDisplay, config,