summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Stoza <stoza@google.com> 2014-12-05 13:43:03 -0800
committer Dan Stoza <stoza@google.com> 2014-12-05 13:43:03 -0800
commit00d504c06ea034befe143e6b8cb34d004670ed02 (patch)
tree56cbd636b5a3dd31f91edc98e81cb677d0907719
parentd723bd7669b4fc88dc282d8bf8ba5ecb2849d22f (diff)
libgui: Only allow one return from useFenceSync
An #ifdef was causing multiple returns in this function, which was triggering an unreachable code error on some build targets. This adds an #else to ensure that only one return is exposed in any given build. Change-Id: I9ed7c3e769bc9094ad31d810944227d1d8302886
-rw-r--r--libs/gui/SyncFeatures.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/gui/SyncFeatures.cpp b/libs/gui/SyncFeatures.cpp
index d466e80f3c..187b211be8 100644
--- a/libs/gui/SyncFeatures.cpp
+++ b/libs/gui/SyncFeatures.cpp
@@ -77,10 +77,11 @@ bool SyncFeatures::useFenceSync() const {
// on some devices it's better to not use EGL_KHR_fence_sync
// even if they have it
return false;
-#endif
+#else
// currently we shall only attempt to use EGL_KHR_fence_sync if
// USE_FENCE_SYNC is set in our makefile
return !mHasNativeFenceSync && mHasFenceSync;
+#endif
}
bool SyncFeatures::useWaitSync() const {
return (useNativeFenceSync() || useFenceSync()) && mHasWaitSync;