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

Commit a2818881 authored by Jim Shargo's avatar Jim Shargo
Browse files

flatland: ConsumerBase-based classes now create their own BufferQueues 

Using ConsumerBase-based classes is now the recommended way to create
BufferQueues.

This is an important step for go/warren-buffers, because it consolidates
usages of BufferQueues to supported APIs and reduces the libgui API
surface that exposes IGBP/IGBC.

BYPASS_IGBP_IGBC_API_REASON: this CL is part of the migration.

Bug: 340933754
Flag: com.android.graphics.libgui.flags.wb_consumer_base_owns_bq
Test: atest, presubmit, compiles
Change-Id: I9f366ef480f2039e4b550dae7854338a1a28b2f8
parent 9d934309

cmds/flatland/GLHelper.cpp

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <GLES2/gl2.h>

#include <GLES2/gl2ext.h>

#include <com_android_graphics_libgui_flags.h>

#include <gui/SurfaceComposerClient.h>

#include <ui/DisplayMode.h>
@@ -202,6 +203,14 @@ bool GLHelper::getShaderProgram(const char* name, GLuint* outPgm) { 


bool GLHelper::createNamedSurfaceTexture(GLuint name, uint32_t w, uint32_t h,

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

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    sp<GLConsumer> glc = new GLConsumer(name, GL_TEXTURE_EXTERNAL_OES, false, true);

    glc->setDefaultBufferSize(w, h);

    glc->getSurface()->setMaxDequeuedBufferCount(2);

    glc->setConsumerUsageBits(GRALLOC_USAGE_HW_COMPOSER);



    sp<ANativeWindow> anw = glc->getSurface();

#else

    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);
@@ -212,6 +221,7 @@ bool GLHelper::createNamedSurfaceTexture(GLuint name, uint32_t w, uint32_t h, 
    glc->setConsumerUsageBits(GRALLOC_USAGE_HW_COMPOSER);



    sp<ANativeWindow> anw = new Surface(producer);

#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    EGLSurface s = eglCreateWindowSurface(mDisplay, mConfig, anw.get(), nullptr);

    if (s == EGL_NO_SURFACE) {

        fprintf(stderr, "eglCreateWindowSurface error: %#x\n", eglGetError());