From ca08833d5ea99130797e10ad68a651b50e99da74 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Thu, 28 Mar 2013 17:44:13 -0700 Subject: don't use compile-time configuration of libgui as much as possible We now detect at runtime which sync features to use, which allows us to remove a lot of the compile-time configuration options. There is still one option though, to disable KHR_fence_sync on some devices (which are more efficient without it). - added a backdoor to get the vendor's EGL strings the new logic is: - use always ANDROID_native_fence_sync if available - fallback to KHR_fence_sync if available and not disabled by the compile-time option - use KHR_wait_sync if available and either of the above is enabled Change-Id: I9c4b49d9ff1151faf902cc93bd53ea5f205aaabf --- libs/gui/GuiConfig.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'libs/gui/GuiConfig.cpp') diff --git a/libs/gui/GuiConfig.cpp b/libs/gui/GuiConfig.cpp index bafd21aaed..bc0c83c557 100644 --- a/libs/gui/GuiConfig.cpp +++ b/libs/gui/GuiConfig.cpp @@ -22,14 +22,8 @@ void appendGuiConfigString(String8& configStr) { static const char* config = " [libgui" -#ifdef USE_FENCE_SYNC - " USE_FENCE_SYNC" -#endif -#ifdef USE_NATIVE_FENCE_SYNC - " USE_NATIVE_FENCE_SYNC" -#endif -#ifdef USE_WAIT_SYNC - " USE_WAIT_SYNC" +#ifdef DONT_USE_FENCE_SYNC + " DONT_USE_FENCE_SYNC" #endif "]"; configStr.append(config); -- cgit v1.2.3-59-g8ed1b