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

Commit 6647e201 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

am c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb 

* commit 'c2efcd2ceadab33b42d938e3771c994816e9a4b0':
  Initialize the SurfaceTexture transform fields.
parents a4474fb1 3a01e11b

libs/gui/SurfaceTexture.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,8 @@ static void mtxMul(float out[16], const float a[16], const float b[16]); 




SurfaceTexture::SurfaceTexture(GLuint tex) :

SurfaceTexture::SurfaceTexture(GLuint tex) :

    mBufferCount(MIN_BUFFER_SLOTS), mCurrentTexture(INVALID_BUFFER_SLOT),

    mBufferCount(MIN_BUFFER_SLOTS), mCurrentTexture(INVALID_BUFFER_SLOT),

    mLastQueued(INVALID_BUFFER_SLOT), mTexName(tex) {

    mCurrentTransform(0), mLastQueued(INVALID_BUFFER_SLOT),

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

    LOGV("SurfaceTexture::SurfaceTexture");

    LOGV("SurfaceTexture::SurfaceTexture");

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

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

        mSlots[i].mEglImage = EGL_NO_IMAGE_KHR;

        mSlots[i].mEglImage = EGL_NO_IMAGE_KHR;