Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5603a2fb authored by Dan Stoza's avatar Dan Stoza
Browse files

Remove deprecated BufferQueue constructor 

Bug: 13415624
Change-Id: I153b5470b21832cebe3c617d28a4ab9c9bf3b362
parent fc9aeb85

libs/gui/tests/CpuConsumer_test.cpp

+5 −3
Original line number Diff line number Diff line
@@ -64,11 +64,13 @@ protected: 
                test_info->name(),

                params.width, params.height,

                params.maxLockedBuffers, params.format);

        sp<BufferQueue> bq = new BufferQueue();

        mCC = new CpuConsumer(bq, params.maxLockedBuffers);

        sp<IGraphicBufferProducer> producer;

        sp<IGraphicBufferConsumer> consumer;

        BufferQueue::createBufferQueue(&producer, &consumer);

        mCC = new CpuConsumer(consumer, params.maxLockedBuffers);

        String8 name("CpuConsumer_Under_Test");

        mCC->setName(name);

        mSTC = new Surface(bq);

        mSTC = new Surface(producer);

        mANW = mSTC;

    }

libs/gui/tests/IGraphicBufferProducer_test.cpp

+1 −4
Original line number Diff line number Diff line
@@ -80,11 +80,9 @@ protected: 
        ALOGV("Begin test: %s.%s", testInfo->test_case_name(),

                testInfo->name());



        mBQ = new BufferQueue();

        mDC = new DummyConsumer;



        mProducer = mBQ;

        mConsumer = mBQ;

        BufferQueue::createBufferQueue(&mProducer, &mConsumer);



        // Test check: Can't connect producer if no consumer yet

        ASSERT_EQ(NO_INIT, TryConnectProducer());
@@ -201,7 +199,6 @@ protected: 
    }



private: // hide from test body

    sp<BufferQueue> mBQ;

    sp<DummyConsumer> mDC;



protected: // accessible from test body

libs/gui/tests/MultiTextureConsumer_test.cpp

+5 −3
Original line number Diff line number Diff line
@@ -34,9 +34,11 @@ protected: 


    virtual void SetUp() {

        GLTest::SetUp();

        sp<BufferQueue> bq = new BufferQueue();

        mGlConsumer = new GLConsumer(bq, TEX_ID);

        mSurface = new Surface(bq);

        sp<IGraphicBufferProducer> producer;

        sp<IGraphicBufferConsumer> consumer;

        BufferQueue::createBufferQueue(&producer, &consumer);

        mGlConsumer = new GLConsumer(consumer, TEX_ID);

        mSurface = new Surface(producer);

        mANW = mSurface.get();



    }

libs/gui/tests/SRGB_test.cpp

+6 −5
Original line number Diff line number Diff line
@@ -68,13 +68,15 @@ protected: 
    }



    virtual void SetUp() {

        mBufferQueue = new BufferQueue();

        ASSERT_EQ(NO_ERROR, mBufferQueue->setDefaultBufferSize(

        sp<IGraphicBufferProducer> producer;

        sp<IGraphicBufferConsumer> consumer;

        BufferQueue::createBufferQueue(&producer, &consumer);

        ASSERT_EQ(NO_ERROR, consumer->setDefaultBufferSize(

                DISPLAY_WIDTH, DISPLAY_HEIGHT));

        mCpuConsumer = new CpuConsumer(mBufferQueue, 1);

        mCpuConsumer = new CpuConsumer(consumer, 1);

        String8 name("CpuConsumer_for_SRGBTest");

        mCpuConsumer->setName(name);

        mInputSurface = new Surface(mBufferQueue);

        mInputSurface = new Surface(producer);



        ASSERT_NO_FATAL_FAILURE(createEGLSurface(mInputSurface.get()));

        ASSERT_NO_FATAL_FAILURE(createDebugSurface());
@@ -222,7 +224,6 @@ protected: 
    }



    // Primary producer and consumer

    sp<BufferQueue> mBufferQueue;

    sp<Surface> mInputSurface;

    sp<CpuConsumer> mCpuConsumer;

    CpuConsumer::LockedBuffer mLockedBuffer;

libs/gui/tests/SurfaceTextureClient_test.cpp

+10 −6
Original line number Diff line number Diff line
@@ -43,9 +43,11 @@ protected: 
        ALOGV("Begin test: %s.%s", testInfo->test_case_name(),

                testInfo->name());



        sp<BufferQueue> bq = new BufferQueue();

        mST = new GLConsumer(bq, 123);

        mSTC = new Surface(bq);

        sp<IGraphicBufferProducer> producer;

        sp<IGraphicBufferConsumer> consumer;

        BufferQueue::createBufferQueue(&producer, &consumer);

        mST = new GLConsumer(consumer, 123);

        mSTC = new Surface(producer);

        mANW = mSTC;



        // We need a valid GL context so we can test updateTexImage()
@@ -711,9 +713,11 @@ protected: 
        ASSERT_NE(EGL_NO_CONTEXT, mEglContext);



        for (int i = 0; i < NUM_SURFACE_TEXTURES; i++) {

            sp<BufferQueue> bq = new BufferQueue();

            sp<GLConsumer> st(new GLConsumer(bq, i));

            sp<Surface> stc(new Surface(bq));

            sp<IGraphicBufferProducer> producer;

            sp<IGraphicBufferConsumer> consumer;

            BufferQueue::createBufferQueue(&producer, &consumer);

            sp<GLConsumer> st(new GLConsumer(consumer, i));

            sp<Surface> stc(new Surface(producer));

            mEglSurfaces[i] = eglCreateWindowSurface(mEglDisplay, myConfig,

                    static_cast<ANativeWindow*>(stc.get()), NULL);

            ASSERT_EQ(EGL_SUCCESS, eglGetError());