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

Commit 345c6114 authored by Conley Owens's avatar Conley Owens Committed by Android Git Automerger
Browse files

am ba5aebd1: am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"

* commit 'ba5aebd106c61567ad6be905efd18902025735aa':
  Add lock before calling initEglImage
parents e940cc1e ddc25bb9
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -986,8 +986,16 @@ status_t Layer::BufferManager::initEglImage(EGLDisplay dpy,
    ssize_t index = mActiveBufferIndex;
    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) {