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

Commit b6a0ca72 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Tweaks for forward compatibility 

Change-Id: Id6a96521b3fd5bd2a034fe89cfa4d3a179a66328
parent 9da67a94

include/gui/GLConsumer.h

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ public: 
    // purely to allow a GLConsumer to be transferred from one consumer

    // context to another. If such a transfer is not needed there is no

    // requirement that either of these methods be called.

    GLConsumer(const sp<BufferQueue>& bq,

            GLuint tex, GLenum texTarget = GL_TEXTURE_EXTERNAL_OES,

            bool useFenceSync = true);

    GLConsumer(GLuint tex, bool allowSynchronousMode = true,

            GLenum texTarget = GL_TEXTURE_EXTERNAL_OES, bool useFenceSync = true,

            const sp<BufferQueue> &bufferQueue = 0);

libs/gui/GLConsumer.cpp

+7 −0
Original line number Diff line number Diff line
@@ -78,6 +78,13 @@ static float mtxRot90[16] = { 
static void mtxMul(float out[16], const float a[16], const float b[16]);





GLConsumer::GLConsumer(const sp<BufferQueue>& bq, GLuint tex,

        GLenum texTarget, bool useFenceSync) :

    ConsumerBase(bq),

    mUseFenceSync(useFenceSync),

    mTexTarget(texTarget) {}





GLConsumer::GLConsumer(GLuint tex, bool allowSynchronousMode,

        GLenum texTarget, bool useFenceSync, const sp<BufferQueue> &bufferQueue) :

    ConsumerBase(bufferQueue == 0 ? new BufferQueue(allowSynchronousMode) : bufferQueue),