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

Commit 33e86c7a authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp 

Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
parents 67020c06 bbfbd303

include/gui/SurfaceTexture.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ public: 


    // tex indicates the name OpenGL texture to which images are to be streamed.

    // This texture name cannot be changed once the SurfaceTexture is created.

    SurfaceTexture(GLuint tex);

    SurfaceTexture(GLuint tex, bool allowSynchronousMode = true);



    virtual ~SurfaceTexture();

libs/gui/SurfaceTexture.cpp

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static float mtxRot270[16] = { 


static void mtxMul(float out[16], const float a[16], const float b[16]);



SurfaceTexture::SurfaceTexture(GLuint tex) :

SurfaceTexture::SurfaceTexture(GLuint tex, bool allowSynchronousMode) :

    mBufferCount(MIN_BUFFER_SLOTS), mCurrentTexture(INVALID_BUFFER_SLOT),

    mCurrentTransform(0), mLastQueued(INVALID_BUFFER_SLOT),

    mLastQueuedTransform(0), mNextTransform(0), mTexName(tex) {