commit 57a532e60bad601e1a6d8aa97e0e131d16200d5a
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 02 22:21:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 02 22:21:25 2018 +0000
tree 1c7da3463b66653a77d6662851710ddb3d9a8722
parent 2ce2f517972a5a3989f0742886a0c6c618417fe2
parent a45e1c8ffa50cf4d547cb86e48ab1f692492fdde

Merge "Fixed incorrect usage of native fences" into pi-dev

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) {