Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions thirdparty/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ Files extracted from upstream source:
- `src/*` apart from CMakeLists.txt and premake4.lua files
- `LICENSE.txt`, and `VERSION` as `VERSION.txt`

Note: Includes fixes sent upstream.
Patch files for the changes are included in the patches folder.


## certs

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,7 @@ struct btSimdScalar
int m_ints[4];
btScalar m_unusedPadding;
};
SIMD_FORCE_INLINE __m128 get128()
{
return m_vec128;
}

SIMD_FORCE_INLINE const __m128 get128() const
SIMD_FORCE_INLINE __m128 get128() const
{
return m_vec128;
}
Expand Down
5 changes: 5 additions & 0 deletions thirdparty/bullet/LinearMath/btVector3.h
Original file line number Diff line number Diff line change
Expand Up @@ -1092,6 +1092,11 @@ class btVector4 : public btVector3
mVec128 = rhs.mVec128;
}

SIMD_FORCE_INLINE btVector4(const btVector4& rhs)
{
mVec128 = rhs.mVec128;
}

SIMD_FORCE_INLINE btVector4&
operator=(const btVector4& v)
{
Expand Down
16 changes: 16 additions & 0 deletions thirdparty/bullet/patches/0001-fix-missing-copy-constructor.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/thirdparty/bullet/LinearMath/btVector3.h b/thirdparty/bullet/LinearMath/btVector3.h
index 9da16277..e15a8ab3 100644
--- a/thirdparty/bullet/LinearMath/btVector3.h
+++ b/thirdparty/bullet/LinearMath/btVector3.h
@@ -1092,6 +1092,11 @@ public:
mVec128 = rhs.mVec128;
}

+ SIMD_FORCE_INLINE btVector4(const btVector4& rhs)
+ {
+ mVec128 = rhs.mVec128;
+ }
+
SIMD_FORCE_INLINE btVector4&
operator=(const btVector4& v)
{
18 changes: 18 additions & 0 deletions thirdparty/bullet/patches/0002-create-single-get128-method.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h
index 8d2f108f..4db7309e 100644
--- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h
+++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btSolverBody.h
@@ -51,12 +51,7 @@ struct btSimdScalar
int m_ints[4];
btScalar m_unusedPadding;
};
- SIMD_FORCE_INLINE __m128 get128()
- {
- return m_vec128;
- }
-
- SIMD_FORCE_INLINE const __m128 get128() const
+ SIMD_FORCE_INLINE __m128 get128() const
{
return m_vec128;
}