commit 6413f3ece7b556a6049a698db51f5fcdd37f6d96
author Treehugger Robot <treehugger-gerrit@google.com> Wed May 24 21:36:36 2023 +0000
committer Copybara-Service <copybara-worker@google.com> Wed May 24 14:37:16 2023 -0700
tree 8370a8353be622f95b68e7d667fd9a042b0cc1e6
parent ff08c7c04109d906701fc9bb49729ac97d83dc44

Merge "Acquire the context lock before reading color buffer"

GitOrigin-RevId: cffc73e893e7e7e4c5d9f93bd6547c47c7885512
Change-Id: I27419d33349c0b5deb0d59240190cdafb89c8c9a

host/FrameBuffer.cpp

diff --git a/host/FrameBuffer.cpp b/host/FrameBuffer.cpp
index 2fb1c7c..967f961 100644
--- a/host/FrameBuffer.cpp
+++ b/host/FrameBuffer.cpp
@@ -3703,6 +3703,12 @@
 }
 
 bool FrameBuffer::invalidateColorBufferForVk(HandleType colorBufferHandle) {
+    // It reads contents from GL, which requires a context lock.
+    // Also we should not do this in PostWorkerGl, otherwise it will deadlock.
+    //
+    // b/283524158
+    // b/273986739
+    AutoLock mutex(m_lock);
     auto colorBuffer = findColorBuffer(colorBufferHandle);
     if (!colorBuffer) {
         ERR("Failed to find ColorBuffer:%d", colorBufferHandle);