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

Commit 86d1d747 authored by Conley Owens's avatar Conley Owens Committed by Android Code Review
Browse files

Merge "Add lock before calling initEglImage"

parents 44935c29 8ecc90d0
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -874,8 +874,16 @@ status_t Layer::BufferManager::initEglImage(EGLDisplay dpy,
    ssize_t index = mActiveBuffer;
    if (index >= 0) {
        if (!mFailover) {
            {
               // Without that lock, there is a chance of race condition
               // where while composing a specific index, requestBuf
               // with the same index can be executed and touch the same data
               // that is being used in initEglImage.
               // (e.g. dirty flag in texture)
               Mutex::Autolock _l(mLock);
               Image& texture(mBufferData[index].texture);
               err = mTextureManager.initEglImage(&texture, dpy, buffer);
            }
            // if EGLImage fails, we switch to regular texture mode, and we
            // free all resources associated with using EGLImages.
            if (err == NO_ERROR) {