diff options
| author | Dan Stoza <stoza@google.com> | 2014-12-05 13:43:03 -0800 |
|---|---|---|
| committer | Dan Stoza <stoza@google.com> | 2015-03-19 10:32:51 -0700 |
| commit | 744fc02fe85884e2cc456303b7471e56a877b970 (patch) | |
| tree | 2d7114f6d297cb071c41e993bee47426b3cfc92e /libs/gui | |
| parent | 55466b48504f9a904c54f3cae4fc1a43dec73a6c (diff) | |
| download | frameworks_native-744fc02fe85884e2cc456303b7471e56a877b970.zip frameworks_native-744fc02fe85884e2cc456303b7471e56a877b970.tar.gz frameworks_native-744fc02fe85884e2cc456303b7471e56a877b970.tar.bz2 | |
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.
Cherry pick of I9ed7c3e769bc9094ad31d810944227d1d8302886
Change-Id: Ibddc5706159d168031d1805fcce3eedc068296cf
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/SyncFeatures.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/gui/SyncFeatures.cpp b/libs/gui/SyncFeatures.cpp index d466e80..187b211 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; |