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

Commit 0dc12aa5 authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge "libgui: Remove custom BufferQueue allocators"

parents ca14018b acd56150

cmds/flatland/GLHelper.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ 
 namespace android {

 namespace android {





GLHelper::GLHelper() :

GLHelper::GLHelper() :

    mGraphicBufferAlloc(new GraphicBufferAlloc()),

    mDisplay(EGL_NO_DISPLAY),

    mDisplay(EGL_NO_DISPLAY),

    mContext(EGL_NO_CONTEXT),

    mContext(EGL_NO_CONTEXT),

    mDummySurface(EGL_NO_SURFACE),

    mDummySurface(EGL_NO_SURFACE),
@@ -203,7 +202,7 @@ bool GLHelper::createNamedSurfaceTexture(GLuint name, uint32_t w, uint32_t h, 
        sp<GLConsumer>* glConsumer, EGLSurface* surface) {

        sp<GLConsumer>* glConsumer, EGLSurface* surface) {

    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    sp<IGraphicBufferConsumer> consumer;

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

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

    sp<GLConsumer> glc = new GLConsumer(consumer, name,

    sp<GLConsumer> glc = new GLConsumer(consumer, name,

            GL_TEXTURE_EXTERNAL_OES, false, true);

            GL_TEXTURE_EXTERNAL_OES, false, true);

    glc->setDefaultBufferSize(w, h);

    glc->setDefaultBufferSize(w, h);

cmds/flatland/GLHelper.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





#include <gui/GraphicBufferAlloc.h>

#include <gui/GLConsumer.h>

#include <gui/GLConsumer.h>

#include <gui/Surface.h>

#include <gui/Surface.h>

#include <gui/SurfaceControl.h>

#include <gui/SurfaceControl.h>
@@ -75,8 +74,6 @@ private: 




    bool setUpShaders(const ShaderDesc* shaderDescs, size_t numShaders);

    bool setUpShaders(const ShaderDesc* shaderDescs, size_t numShaders);





    sp<GraphicBufferAlloc> mGraphicBufferAlloc;



    EGLDisplay mDisplay;

    EGLDisplay mDisplay;

    EGLContext mContext;

    EGLContext mContext;

    EGLSurface mDummySurface;

    EGLSurface mDummySurface;

include/gui/BufferQueue.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -76,8 +76,7 @@ public: 
    // producers and consumers. allocator is used to allocate all the

    // producers and consumers. allocator is used to allocate all the

    // needed gralloc buffers.

    // needed gralloc buffers.

    static void createBufferQueue(sp<IGraphicBufferProducer>* outProducer,

    static void createBufferQueue(sp<IGraphicBufferProducer>* outProducer,

            sp<IGraphicBufferConsumer>* outConsumer,

            sp<IGraphicBufferConsumer>* outConsumer);

            const sp<IGraphicBufferAlloc>& allocator = NULL);





private:

private:

    BufferQueue(); // Create through createBufferQueue

    BufferQueue(); // Create through createBufferQueue

include/gui/BufferQueueCore.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ public: 
    // BufferQueueCore manages a pool of gralloc memory slots to be used by

    // BufferQueueCore manages a pool of gralloc memory slots to be used by

    // producers and consumers. allocator is used to allocate all the needed

    // producers and consumers. allocator is used to allocate all the needed

    // gralloc buffers.

    // gralloc buffers.

    BufferQueueCore(const sp<IGraphicBufferAlloc>& allocator = NULL);

    BufferQueueCore();

    virtual ~BufferQueueCore();

    virtual ~BufferQueueCore();





private:

private:

libs/gui/BufferQueue.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -62,14 +62,13 @@ void BufferQueue::ProxyConsumerListener::onSidebandStreamChanged() { 
}

}





void BufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer,

void BufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer,

        sp<IGraphicBufferConsumer>* outConsumer,

        sp<IGraphicBufferConsumer>* outConsumer) {

        const sp<IGraphicBufferAlloc>& allocator) {

    LOG_ALWAYS_FATAL_IF(outProducer == NULL,

    LOG_ALWAYS_FATAL_IF(outProducer == NULL,

            "BufferQueue: outProducer must not be NULL");

            "BufferQueue: outProducer must not be NULL");

    LOG_ALWAYS_FATAL_IF(outConsumer == NULL,

    LOG_ALWAYS_FATAL_IF(outConsumer == NULL,

            "BufferQueue: outConsumer must not be NULL");

            "BufferQueue: outConsumer must not be NULL");





    sp<BufferQueueCore> core(new BufferQueueCore(allocator));

    sp<BufferQueueCore> core(new BufferQueueCore());

    LOG_ALWAYS_FATAL_IF(core == NULL,

    LOG_ALWAYS_FATAL_IF(core == NULL,

            "BufferQueue: failed to create BufferQueueCore");

            "BufferQueue: failed to create BufferQueueCore");