ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am c1930630: Merge "libgui: Only allow one return from useFenceSync"

Browse Source 
* commit 'c193063050e6be193838527fb8bc7a4588bfdc22':
  libgui: Only allow one return from useFenceSync
This commit is contained in:
Dan Stoza 2015-03-19 17:49:34 +00:00 committed by Android Git Automerger
commit 42f0ce1075
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/gui/SyncFeatures.cpp
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;