Merge "libgui: Only allow one return from useFenceSync"

This commit is contained in:
Dan Stoza 2015-03-19 17:35:56 +00:00 committed by Gerrit Code Review
commit c193063050

View File

@ -77,10 +77,11 @@ bool SyncFeatures::useFenceSync() const {
// on some devices it's better to not use EGL_KHR_fence_sync // on some devices it's better to not use EGL_KHR_fence_sync
// even if they have it // even if they have it
return false; return false;
#endif #else
// currently we shall only attempt to use EGL_KHR_fence_sync if // currently we shall only attempt to use EGL_KHR_fence_sync if
// USE_FENCE_SYNC is set in our makefile // USE_FENCE_SYNC is set in our makefile
return !mHasNativeFenceSync && mHasFenceSync; return !mHasNativeFenceSync && mHasFenceSync;
#endif
} }
bool SyncFeatures::useWaitSync() const { bool SyncFeatures::useWaitSync() const {
return (useNativeFenceSync() || useFenceSync()) && mHasWaitSync; return (useNativeFenceSync() || useFenceSync()) && mHasWaitSync;