mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-14 13:50:04 +00:00
initialize values (padding etc) help asan/msan tests
This commit is contained in:
parent
7da4a362e1
commit
fc6fb7b14c
@ -1336,6 +1336,8 @@ const char* btQuantizedBvh::serialize(void* dataBuffer, btSerializer* serializer
|
||||
memPtr->m_escapeIndex = m_contiguousNodes[i].m_escapeIndex;
|
||||
memPtr->m_subPart = m_contiguousNodes[i].m_subPart;
|
||||
memPtr->m_triangleIndex = m_contiguousNodes[i].m_triangleIndex;
|
||||
// Fill padding with zeros to appease msan.
|
||||
memset(memPtr->m_pad, 0, sizeof(memPtr->m_pad));
|
||||
}
|
||||
serializer->finalizeChunk(chunk,"btOptimizedBvhNodeData",BT_ARRAY_CODE,(void*)&m_contiguousNodes[0]);
|
||||
}
|
||||
|
@ -18,9 +18,11 @@ subject to the following restrictions:
|
||||
#include "LinearMath/btSerializer.h"
|
||||
|
||||
btCollisionObject::btCollisionObject()
|
||||
: m_anisotropicFriction(1.f,1.f,1.f),
|
||||
m_hasAnisotropicFriction(false),
|
||||
m_contactProcessingThreshold(BT_LARGE_FLOAT),
|
||||
: m_interpolationLinearVelocity(0.f, 0.f, 0.f),
|
||||
m_interpolationAngularVelocity(0.f, 0.f, 0.f),
|
||||
m_anisotropicFriction(1.f,1.f,1.f),
|
||||
m_hasAnisotropicFriction(false),
|
||||
m_contactProcessingThreshold(BT_LARGE_FLOAT),
|
||||
m_broadphaseHandle(0),
|
||||
m_collisionShape(0),
|
||||
m_extensionPointer(0),
|
||||
@ -48,6 +50,7 @@ btCollisionObject::btCollisionObject()
|
||||
m_updateRevision(0)
|
||||
{
|
||||
m_worldTransform.setIdentity();
|
||||
m_interpolationWorldTransform.setIdentity();
|
||||
}
|
||||
|
||||
btCollisionObject::~btCollisionObject()
|
||||
@ -112,6 +115,9 @@ const char* btCollisionObject::serialize(void* dataBuffer, btSerializer* seriali
|
||||
dataOut->m_ccdMotionThreshold = m_ccdMotionThreshold;
|
||||
dataOut->m_checkCollideWith = m_checkCollideWith;
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
memset(dataOut->m_padding, 0, sizeof(dataOut->m_padding));
|
||||
|
||||
return btCollisionObjectDataName;
|
||||
}
|
||||
|
||||
|
@ -437,6 +437,9 @@ const char* btBvhTriangleMeshShape::serialize(void* dataBuffer, btSerializer* se
|
||||
trimeshData->m_triangleInfoMap = 0;
|
||||
}
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
memset(trimeshData->m_pad3, 0, sizeof(trimeshData->m_pad3));
|
||||
|
||||
return "btTriangleMeshShapeData";
|
||||
}
|
||||
|
||||
|
@ -164,11 +164,17 @@ SIMD_FORCE_INLINE int btCapsuleShape::calculateSerializeBufferSize() const
|
||||
SIMD_FORCE_INLINE const char* btCapsuleShape::serialize(void* dataBuffer, btSerializer* serializer) const
|
||||
{
|
||||
btCapsuleShapeData* shapeData = (btCapsuleShapeData*) dataBuffer;
|
||||
|
||||
|
||||
btConvexInternalShape::serialize(&shapeData->m_convexInternalShapeData,serializer);
|
||||
|
||||
shapeData->m_upAxis = m_upAxis;
|
||||
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
shapeData->m_padding[0] = 0;
|
||||
shapeData->m_padding[1] = 0;
|
||||
shapeData->m_padding[2] = 0;
|
||||
shapeData->m_padding[3] = 0;
|
||||
|
||||
return "btCapsuleShapeData";
|
||||
}
|
||||
|
||||
|
@ -106,7 +106,10 @@ const char* btCollisionShape::serialize(void* dataBuffer, btSerializer* serializ
|
||||
serializer->serializeName(name);
|
||||
}
|
||||
shapeData->m_shapeType = m_shapeType;
|
||||
//shapeData->m_padding//??
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
memset(shapeData->m_padding, 0, sizeof(shapeData->m_padding));
|
||||
|
||||
return "btCollisionShapeData";
|
||||
}
|
||||
|
||||
|
@ -168,11 +168,17 @@ SIMD_FORCE_INLINE int btConeShape::calculateSerializeBufferSize() const
|
||||
SIMD_FORCE_INLINE const char* btConeShape::serialize(void* dataBuffer, btSerializer* serializer) const
|
||||
{
|
||||
btConeShapeData* shapeData = (btConeShapeData*) dataBuffer;
|
||||
|
||||
|
||||
btConvexInternalShape::serialize(&shapeData->m_convexInternalShapeData,serializer);
|
||||
|
||||
|
||||
shapeData->m_upIndex = m_coneIndices[1];
|
||||
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
shapeData->m_padding[0] = 0;
|
||||
shapeData->m_padding[1] = 0;
|
||||
shapeData->m_padding[2] = 0;
|
||||
shapeData->m_padding[3] = 0;
|
||||
|
||||
return "btConeShapeData";
|
||||
}
|
||||
|
||||
|
@ -211,7 +211,10 @@ const char* btConvexHullShape::serialize(void* dataBuffer, btSerializer* seriali
|
||||
}
|
||||
serializer->finalizeChunk(chunk,btVector3DataName,BT_ARRAY_CODE,(void*)&m_unscaledPoints[0]);
|
||||
}
|
||||
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
memset(shapeData->m_padding3, 0, sizeof(shapeData->m_padding3));
|
||||
|
||||
return "btConvexHullShapeData";
|
||||
}
|
||||
|
||||
|
@ -172,6 +172,9 @@ SIMD_FORCE_INLINE const char* btConvexInternalShape::serialize(void* dataBuffer,
|
||||
m_localScaling.serializeFloat(shapeData->m_localScaling);
|
||||
shapeData->m_collisionMargin = float(m_collisionMargin);
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
shapeData->m_padding = 0;
|
||||
|
||||
return "btConvexInternalShapeData";
|
||||
}
|
||||
|
||||
|
@ -199,11 +199,17 @@ SIMD_FORCE_INLINE int btCylinderShape::calculateSerializeBufferSize() const
|
||||
SIMD_FORCE_INLINE const char* btCylinderShape::serialize(void* dataBuffer, btSerializer* serializer) const
|
||||
{
|
||||
btCylinderShapeData* shapeData = (btCylinderShapeData*) dataBuffer;
|
||||
|
||||
|
||||
btConvexInternalShape::serialize(&shapeData->m_convexInternalShapeData,serializer);
|
||||
|
||||
shapeData->m_upAxis = m_upAxis;
|
||||
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
shapeData->m_padding[0] = 0;
|
||||
shapeData->m_padding[1] = 0;
|
||||
shapeData->m_padding[2] = 0;
|
||||
shapeData->m_padding[3] = 0;
|
||||
|
||||
return "btCylinderShapeData";
|
||||
}
|
||||
|
||||
|
@ -175,7 +175,10 @@ const char* btMultiSphereShape::serialize(void* dataBuffer, btSerializer* serial
|
||||
}
|
||||
serializer->finalizeChunk(chunk,"btPositionAndRadius",BT_ARRAY_CODE,(void*)&m_localPositionArray[0]);
|
||||
}
|
||||
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
memset(shapeData->m_padding, 0, sizeof(shapeData->m_padding));
|
||||
|
||||
return "btMultiSphereShapeData";
|
||||
}
|
||||
|
||||
|
@ -94,7 +94,13 @@ SIMD_FORCE_INLINE const char* btStaticPlaneShape::serialize(void* dataBuffer, bt
|
||||
m_localScaling.serializeFloat(planeData->m_localScaling);
|
||||
m_planeNormal.serializeFloat(planeData->m_planeNormal);
|
||||
planeData->m_planeConstant = float(m_planeConstant);
|
||||
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
planeData->m_pad[0] = 0;
|
||||
planeData->m_pad[1] = 0;
|
||||
planeData->m_pad[2] = 0;
|
||||
planeData->m_pad[3] = 0;
|
||||
|
||||
return "btStaticPlaneShapeData";
|
||||
}
|
||||
|
||||
|
@ -293,6 +293,9 @@ const char* btStridingMeshInterface::serialize(void* dataBuffer, btSerializer* s
|
||||
tmpIndices[gfxindex].m_values[0] = tri_indices[0];
|
||||
tmpIndices[gfxindex].m_values[1] = tri_indices[1];
|
||||
tmpIndices[gfxindex].m_values[2] = tri_indices[2];
|
||||
// Fill padding with zeros to appease msan.
|
||||
tmpIndices[gfxindex].m_pad[0] = 0;
|
||||
tmpIndices[gfxindex].m_pad[1] = 0;
|
||||
}
|
||||
serializer->finalizeChunk(chunk,"btShortIntIndexTripletData",BT_ARRAY_CODE,(void*)chunk->m_oldPtr);
|
||||
}
|
||||
@ -311,6 +314,8 @@ const char* btStridingMeshInterface::serialize(void* dataBuffer, btSerializer* s
|
||||
tmpIndices[gfxindex].m_values[0] = tri_indices[0];
|
||||
tmpIndices[gfxindex].m_values[1] = tri_indices[1];
|
||||
tmpIndices[gfxindex].m_values[2] = tri_indices[2];
|
||||
// Fill padding with zeros to appease msan.
|
||||
tmpIndices[gfxindex].m_pad = 0;
|
||||
}
|
||||
serializer->finalizeChunk(chunk,"btCharIndexTripletData",BT_ARRAY_CODE,(void*)chunk->m_oldPtr);
|
||||
}
|
||||
@ -375,6 +380,8 @@ const char* btStridingMeshInterface::serialize(void* dataBuffer, btSerializer* s
|
||||
serializer->finalizeChunk(chunk,"btMeshPartData",BT_ARRAY_CODE,chunk->m_oldPtr);
|
||||
}
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
memset(trimeshData->m_padding, 0, sizeof(trimeshData->m_padding));
|
||||
|
||||
m_scaling.serializeFloat(trimeshData->m_scaling);
|
||||
return "btStridingMeshInterfaceData";
|
||||
|
@ -195,6 +195,13 @@ SIMD_FORCE_INLINE const char* btTriangleInfoMap::serialize(void* dataBuffer, btS
|
||||
serializer->finalizeChunk(chunk,"int",BT_ARRAY_CODE,(void*) &m_keyArray[0]);
|
||||
|
||||
}
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
tmapData->m_padding[0] = 0;
|
||||
tmapData->m_padding[1] = 0;
|
||||
tmapData->m_padding[2] = 0;
|
||||
tmapData->m_padding[3] = 0;
|
||||
|
||||
return "btTriangleInfoMapData";
|
||||
}
|
||||
|
||||
|
@ -141,6 +141,14 @@ SIMD_FORCE_INLINE const char* btGearConstraint::serialize(void* dataBuffer, btSe
|
||||
|
||||
gear->m_ratio = m_ratio;
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
#ifndef BT_USE_DOUBLE_PRECISION
|
||||
gear->m_padding[0] = 0;
|
||||
gear->m_padding[1] = 0;
|
||||
gear->m_padding[2] = 0;
|
||||
gear->m_padding[3] = 0;
|
||||
#endif
|
||||
|
||||
return btGearConstraintDataName;
|
||||
}
|
||||
|
||||
|
@ -664,6 +664,11 @@ SIMD_FORCE_INLINE const char* btGeneric6DofSpring2Constraint::serialize(void* da
|
||||
|
||||
dof->m_rotateOrder = m_rotateOrder;
|
||||
|
||||
dof->m_padding1[0] = 0;
|
||||
dof->m_padding1[1] = 0;
|
||||
dof->m_padding1[2] = 0;
|
||||
dof->m_padding1[3] = 0;
|
||||
|
||||
return btGeneric6DofSpring2ConstraintDataName;
|
||||
}
|
||||
|
||||
|
@ -489,6 +489,14 @@ SIMD_FORCE_INLINE const char* btHingeConstraint::serialize(void* dataBuffer, btS
|
||||
hingeData->m_relaxationFactor = float(m_relaxationFactor);
|
||||
#endif
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
#ifdef BT_USE_DOUBLE_PRECISION
|
||||
hingeData->m_padding1[0] = 0;
|
||||
hingeData->m_padding1[1] = 0;
|
||||
hingeData->m_padding1[2] = 0;
|
||||
hingeData->m_padding1[3] = 0;
|
||||
#endif
|
||||
|
||||
return btHingeConstraintDataName;
|
||||
}
|
||||
|
||||
|
@ -1511,6 +1511,9 @@ void btDiscreteDynamicsWorld::serializeDynamicsWorldInfo(btSerializer* serialize
|
||||
|
||||
worldInfo->m_solverInfo.m_splitImpulse = getSolverInfo().m_splitImpulse;
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
memset(worldInfo->m_solverInfo.m_padding, 0, sizeof(worldInfo->m_solverInfo.m_padding));
|
||||
|
||||
#ifdef BT_USE_DOUBLE_PRECISION
|
||||
const char* structType = "btDynamicsWorldDoubleData";
|
||||
#else//BT_USE_DOUBLE_PRECISION
|
||||
|
@ -507,6 +507,11 @@ const char* btRigidBody::serialize(void* dataBuffer, class btSerializer* seriali
|
||||
rbd->m_linearSleepingThreshold=m_linearSleepingThreshold;
|
||||
rbd->m_angularSleepingThreshold = m_angularSleepingThreshold;
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
#ifdef BT_USE_DOUBLE_PRECISION
|
||||
memset(rbd->m_padding, 0, sizeof(rbd->m_padding));
|
||||
#endif
|
||||
|
||||
return btRigidBodyDataName;
|
||||
}
|
||||
|
||||
|
@ -2013,5 +2013,10 @@ const char* btMultiBody::serialize(void* dataBuffer, class btSerializer* seriali
|
||||
}
|
||||
mbd->m_links = mbd->m_numLinks? (btMultiBodyLinkData*) serializer->getUniquePointer((void*)&m_links[0]):0;
|
||||
|
||||
// Fill padding with zeros to appease msan.
|
||||
#ifdef BT_USE_DOUBLE_PRECISION
|
||||
memset(mbd->m_padding, 0, sizeof(mbd->m_padding));
|
||||
#endif
|
||||
|
||||
return btMultiBodyDataName;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user