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

fixes to keep compiler and unix/libspe developers happy

Browse Source
This commit is contained in:
erwin.coumans
2008-12-01 16:22:43 +00:00
parent dd21959709
commit bfa8ebfbd8
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/BulletDynamics/ConstraintSolver/btSolverBody.h
View File

@@ -24,13 +24,12 @@ class btRigidBody;
#include "LinearMath/btTransformUtil.h" #include "LinearMath/btTransformUtil.h"
///Until we get other contributions, only use SIMD on Windows, when using Visual Studio 2008 or later, and not double precision ///Until we get other contributions, only use SIMD on Windows, when using Visual Studio 2008 or later, and not double precision
#if (defined (WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION)) #ifdef BT_USE_SSE
#define USE_SIMD 1 #define USE_SIMD 1
#endif // #endif //
#ifdef USE_SIMD #ifdef USE_SIMD
#include <emmintrin.h>
struct btSimdScalar struct btSimdScalar
{ {

1
src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
View File

@@ -21,7 +21,6 @@ class btRigidBody;
#include "LinearMath/btMatrix3x3.h" #include "LinearMath/btMatrix3x3.h"
#include "btJacobianEntry.h" #include "btJacobianEntry.h"
#include <emmintrin.h>
//#define NO_FRICTION_TANGENTIALS 1 //#define NO_FRICTION_TANGENTIALS 1
#include "btSolverBody.h" #include "btSolverBody.h"

2
src/LinearMath/btScalar.h
View File

@@ -62,6 +62,8 @@ inline int btGetVersion()
#define btFsel(a,b,c) __fsel((a),(b),(c)) #define btFsel(a,b,c) __fsel((a),(b),(c))
#else #else
#define BT_USE_SSE #define BT_USE_SSE
#include <emmintrin.h>
#endif #endif
#endif //__MINGW32__ #endif //__MINGW32__

3
src/LinearMath/btVector3.h
View File

@@ -21,7 +21,6 @@ subject to the following restrictions:
#include "btScalar.h" #include "btScalar.h"
#include "btScalar.h" #include "btScalar.h"
#include "btMinMax.h" #include "btMinMax.h"
#include <emmintrin.h>
/**@brief btVector3 can be used to represent 3D points and vectors. /**@brief btVector3 can be used to represent 3D points and vectors.
* It has an un-used w component to suit 16-byte alignment when btVector3 is stored in containers. This extra component can be used by derived classes (Quaternion?) or by user * It has an un-used w component to suit 16-byte alignment when btVector3 is stored in containers. This extra component can be used by derived classes (Quaternion?) or by user
* Ideally, this class should be replaced by a platform optimized SIMD version that keeps the data in registers * Ideally, this class should be replaced by a platform optimized SIMD version that keeps the data in registers
@@ -43,7 +42,7 @@ public:
} }
public: public:
#else //__CELLOS_LV2__ __SPU__ #else //__CELLOS_LV2__ __SPU__
#ifdef WIN32 #ifdef BT_USE_SSE // WIN32
union { union {
__m128 mVec128; __m128 mVec128;
btScalar m_floats[4]; btScalar m_floats[4];