commit a45e1c8ffa50cf4d547cb86e48ab1f692492fdde
author Jeffrey Kardatzke <jkardatzke@google.com> Tue Mar 13 12:07:28 2018 -0700
committer Jeffrey Kardatzke <jkardatzke@google.com> Tue Mar 27 23:26:18 2018 +0000
tree a61970e6c4691fd4d7bad7592ae9cac118f11296
parent 2afd5172c3e6bd99a287d24a1dd5fe5c7b70754e

Fixed incorrect usage of native fences

This code was checking SyncFeatures::useWaitSync() and if that was true
was then using the EGL_ANDROID_native_fence_sync feature which is
incorrect. It can only use that feature if
SyncFeatures::useNativeFenceSync is true. Since it does also use
eglWaitSyncKHR, the check for useWaitSync() was left in as well.

Bug: 38452042, 77146928
Test: Verified screen capture test works on samus now

Change-Id: I5aad16c1b974b641c30faf2b1bc93ff8bedd5186
(cherry picked from commit 487abfa65449317d43877655750d7ead639d3ad6)

libs/gui/GLConsumer.cpp

diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp
index 788a6eb..885efec 100644
--- a/libs/gui/GLConsumer.cpp
+++ b/libs/gui/GLConsumer.cpp
@@ -984,7 +984,8 @@
     }
 
     if (mCurrentFence->isValid()) {
-        if (SyncFeatures::getInstance().useWaitSync()) {
+        if (SyncFeatures::getInstance().useWaitSync() &&
+            SyncFeatures::getInstance().useNativeFenceSync()) {
             // Create an EGLSyncKHR from the current fence.
             int fenceFd = mCurrentFence->dup();
             if (fenceFd == -1) {