Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1419 from kwasimensah/master

Browse Source 
Update support for buggy android NDK
This commit is contained in:
erwincoumans
2017-11-07 19:55:38 -08:00
committed by GitHub
parent 62f4737bb1 8aefa7e8d0
commit ee2f56875d
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/LinearMath/btQuickprof.cpp
View File

@@ -680,47 +680,49 @@ void CProfileManager::dumpAll()
CProfileManager::Release_Iterator(profileIterator); CProfileManager::Release_Iterator(profileIterator);
} }
// clang-format off
#if defined(_WIN32) && (defined(__MINGW32__) || defined(__MINGW64__))
#define BT_HAVE_TLS 1
#elif __APPLE__ && !TARGET_OS_IPHONE
// TODO: Modern versions of iOS support TLS now with updated version checking.
#define BT_HAVE_TLS 1
#elif __linux__
#define BT_HAVE_TLS 1
#endif
// __thread is broken on Andorid clang until r12b. See
// https://github.com/android-ndk/ndk/issues/8
#if defined(__ANDROID__) && defined(__clang__)
#if __has_include(<android/ndk-version.h>)
#include <android/ndk-version.h>
#endif // __has_include(<android/ndk-version.h>)
#if defined(__NDK_MAJOR__) && \
((__NDK_MAJOR__ < 12) || ((__NDK_MAJOR__ == 12) && (__NDK_MINOR__ < 1)))
#undef BT_HAVE_TLS
#endif
#endif // defined(__ANDROID__) && defined(__clang__)
// clang-format on
unsigned int btQuickprofGetCurrentThreadIndex2() {
const unsigned int kNullIndex = ~0U;
unsigned int btQuickprofGetCurrentThreadIndex2()
{
#if BT_THREADSAFE #if BT_THREADSAFE
return btGetCurrentThreadIndex(); return btGetCurrentThreadIndex();
#else // #if BT_THREADSAFE #elif defined(BT_HAVE_TLS)
const unsigned int kNullIndex = ~0U; static __thread unsigned int sThreadIndex = kNullIndex;
#ifdef _WIN32 #elif defined(_WIN32)
#if defined(__MINGW32__) || defined(__MINGW64__) __declspec(thread) static unsigned int sThreadIndex = kNullIndex;
static __thread unsigned int sThreadIndex = kNullIndex;
#else
__declspec( thread ) static unsigned int sThreadIndex = kNullIndex;
#endif
#else #else
#ifdef __APPLE__ unsigned int sThreadIndex = 0;
#if TARGET_OS_IPHONE return -1;
unsigned int sThreadIndex = 0;
return -1;
#else
static __thread unsigned int sThreadIndex = kNullIndex;
#endif
#else//__APPLE__
#if __linux__
static __thread unsigned int sThreadIndex = kNullIndex;
#else
unsigned int sThreadIndex = 0;
return -1;
#endif #endif
#endif//__APPLE__
#endif
static int gThreadCounter=0;
if ( sThreadIndex == kNullIndex ) static int gThreadCounter = 0;
{
sThreadIndex = gThreadCounter++; if (sThreadIndex == kNullIndex) {
} sThreadIndex = gThreadCounter++;
return sThreadIndex; }
#endif // #else // #if BT_THREADSAFE return sThreadIndex;
} }
void btEnterProfileZoneDefault(const char* name) void btEnterProfileZoneDefault(const char* name)