From 424e8b69f1a008aa5e06ec05b67536bc76715695 Mon Sep 17 00:00:00 2001 From: Sergej Reich Date: Mon, 6 May 2013 22:53:11 +0000 Subject: bullet: Don't use sse in api for windows. Remove stray BT_USE_SSE_IN_API definitions. Was causing problems especially for 32 bit windows. It's not quite clear why they were added in the first place since this should be defined in btScalar.h, needs further investigation. Thanks to Francisco De La Cruz (xercesblue) for looking into this. Should fix [#35071] Bullet Convex Hull Crashes on Win32 with SSE --- .../src/BulletCollision/CollisionShapes/btConvexHullShape.cpp | 6 +++--- .../bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp | 6 +++--- .../src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp | 6 +++--- .../src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp | 6 +++--- extern/bullet2/src/LinearMath/btVector3.cpp | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'extern/bullet2') diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp index 0623e351a97..02ea5033b15 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp @@ -13,9 +13,9 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#if defined (_WIN32) || defined (__i386__) -#define BT_USE_SSE_IN_API -#endif +//#if defined (_WIN32) || defined (__i386__) +//#define BT_USE_SSE_IN_API +//#endif #include "btConvexHullShape.h" #include "BulletCollision/CollisionShapes/btCollisionMargin.h" diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp index 4b16130211f..9d40dfdd0dd 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp @@ -13,9 +13,9 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#if defined (_WIN32) || defined (__i386__) -#define BT_USE_SSE_IN_API -#endif +//#if defined (_WIN32) || defined (__i386__) +//#define BT_USE_SSE_IN_API +//#endif #include "btConvexShape.h" #include "btTriangleShape.h" diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp index a7362ea01f4..6abfdffa677 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp @@ -13,9 +13,9 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ -#if defined (_WIN32) || defined (__i386__) -#define BT_USE_SSE_IN_API -#endif +//#if defined (_WIN32) || defined (__i386__) +//#define BT_USE_SSE_IN_API +//#endif #include "btMultiSphereShape.h" #include "BulletCollision/CollisionShapes/btCollisionMargin.h" diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp index 4854f370f73..9095c592d87 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp @@ -12,9 +12,9 @@ subject to the following restrictions: 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. */ -#if defined (_WIN32) || defined (__i386__) -#define BT_USE_SSE_IN_API -#endif +//#if defined (_WIN32) || defined (__i386__) +//#define BT_USE_SSE_IN_API +//#endif #include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h" #include "btConvexPolyhedron.h" diff --git a/extern/bullet2/src/LinearMath/btVector3.cpp b/extern/bullet2/src/LinearMath/btVector3.cpp index 1c26e523d80..bcb18704b93 100644 --- a/extern/bullet2/src/LinearMath/btVector3.cpp +++ b/extern/bullet2/src/LinearMath/btVector3.cpp @@ -15,9 +15,9 @@ This source version has been altered. */ -#if defined (_WIN32) || defined (__i386__) -#define BT_USE_SSE_IN_API -#endif +//#if defined (_WIN32) || defined (__i386__) +//#define BT_USE_SSE_IN_API +//#endif #include "btVector3.h" -- cgit v1.2.3