diff options
| author | 2014-12-08 18:46:08 +0000 | |
|---|---|---|
| committer | 2014-12-08 18:46:08 +0000 | |
| commit | e22262ffd0bbed53e6d964f2fbcd5ecd85c04403 (patch) | |
| tree | dd5b7d0f0fcda5037fdff7024bec79a6b2848498 /libs/gui/SyncFeatures.cpp | |
| parent | 8fd567b127170a3962bc9de637eb7987cee71810 (diff) | |
| parent | dd883c0b08d2a60f89542b9b9f5fdabcb14885c7 (diff) | |
Merge "libgui: Enable -Weverything and -Werror"
Diffstat (limited to 'libs/gui/SyncFeatures.cpp')
| -rw-r--r-- | libs/gui/SyncFeatures.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/SyncFeatures.cpp b/libs/gui/SyncFeatures.cpp index e5804a77b1..187b211be8 100644 --- a/libs/gui/SyncFeatures.cpp +++ b/libs/gui/SyncFeatures.cpp @@ -16,7 +16,6 @@ #define LOG_TAG "GLConsumer" -#define GL_GLEXT_PROTOTYPES #define EGL_EGLEXT_PROTOTYPES #include <EGL/egl.h> @@ -78,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; |