commit d9be4fe931dce6d1e87d5ceb0f2d8367d82f9b26
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Sep 27 23:01:23 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Sep 27 23:01:23 2021 +0000
tree 0c16d62467abaaf70e413199f2c5e92f266b0928
parent 78fd67314fc248960950e78e4abfb6f01822e937
parent fe16e9267d8dec34c94d3ea4183033b92cca2905

Snap for 7771957 from fe16e9267d8dec34c94d3ea4183033b92cca2905 to sc-v2-release

Change-Id: I25715e642c2563cff70618df03df54d4e7674359

stream-servers/ColorBuffer.cpp

diff --git a/stream-servers/ColorBuffer.cpp b/stream-servers/ColorBuffer.cpp
index a01002f..100aad6 100644
--- a/stream-servers/ColorBuffer.cpp
+++ b/stream-servers/ColorBuffer.cpp
@@ -371,6 +371,7 @@
     }
     p_format = sGetUnsizedColorBufferFormat(p_format);
     touch();
+    waitSync();
 
     if (bindFbo(&m_fbo, m_tex)) {
         GLint prevAlignment = 0;
@@ -394,6 +395,7 @@
     }
     p_format = sGetUnsizedColorBufferFormat(p_format);
     touch();
+    waitSync();
     GLuint tex = m_resizer->update(m_tex, width, height, rotation);
     if (bindFbo(&m_scaleRotationFbo, tex)) {
         GLint prevAlignment = 0;
@@ -417,6 +419,7 @@
     }
 
     touch();
+    waitSync();
 
 #if DEBUG_CB_FBO
     fprintf(stderr, "%s %d request width %d height %d\n", __func__, __LINE__,