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

fixes in PosixThreadSupport to enable ThreadingDemo and MultiThreadingDemo to run properly.

Browse Source 
fix autotools build (added missing files)
This commit is contained in:
erwin.coumans
2011-03-30 19:01:29 +00:00
parent 2a856f8c32
commit 88b19eb023
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/OpenCLClothDemo/CMakeLists.txt
View File

@@ -1,6 +1,4 @@
IF(BUILD_MINICL_OPENCL_DEMOS)
SUBDIRS( MiniCL ) SUBDIRS( MiniCL )
ENDIF()
IF(BUILD_AMD_OPENCL_DEMOS) IF(BUILD_AMD_OPENCL_DEMOS)
SUBDIRS(AMD) SUBDIRS(AMD)

3
src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/CMakeLists.txt
View File

@@ -1,7 +1,4 @@
IF(BUILD_MINICL_OPENCL_DEMOS)
SUBDIRS( MiniCL ) SUBDIRS( MiniCL )
ENDIF()
IF(BUILD_AMD_OPENCL_DEMOS) IF(BUILD_AMD_OPENCL_DEMOS)
SUBDIRS(AMD) SUBDIRS(AMD)

6
src/BulletMultiThreaded/PosixThreadSupport.cpp
View File

@@ -247,7 +247,7 @@ void PosixThreadSupport::stopSPU()
printf("destroy semaphore\n"); printf("destroy semaphore\n");
destroySem(spuStatus.startSemaphore); destroySem(spuStatus.startSemaphore);
printf("semaphore destroyed\n"); printf("semaphore destroyed\n");
checkPThreadFunction(pthread_cancel(spuStatus.thread)); checkPThreadFunction(pthread_join(spuStatus.thread,0));
} }
printf("destroy main semaphore\n"); printf("destroy main semaphore\n");
destroySem(mainSemaphore); destroySem(mainSemaphore);
@@ -385,7 +385,9 @@ public:
btBarrier* PosixThreadSupport::createBarrier() btBarrier* PosixThreadSupport::createBarrier()
{ {
return new PosixBarrier(); PosixBarrier* barrier = new PosixBarrier();
barrier->setMaxCount(getNumTasks());
return barrier;
} }
btCriticalSection* PosixThreadSupport::createCriticalSection() btCriticalSection* PosixThreadSupport::createCriticalSection()

3
src/Makefile.am
View File

@@ -95,6 +95,7 @@ libLinearMath_la_SOURCES = \
LinearMath/btAlignedAllocator.cpp \ LinearMath/btAlignedAllocator.cpp \
LinearMath/btSerializer.cpp \ LinearMath/btSerializer.cpp \
LinearMath/btConvexHull.cpp \ LinearMath/btConvexHull.cpp \
LinearMath/btConvexHullComputer.cpp \
LinearMath/btHashMap.h \ LinearMath/btHashMap.h \
LinearMath/btConvexHull.h \ LinearMath/btConvexHull.h \
LinearMath/btAabbUtil2.h \ LinearMath/btAabbUtil2.h \
@@ -128,6 +129,7 @@ libBulletCollision_la_SOURCES = \
BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp \ BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp \
BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp \ BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp \
BulletCollision/NarrowPhaseCollision/btConvexCast.cpp \ BulletCollision/NarrowPhaseCollision/btConvexCast.cpp \
BulletCollision/NarrowPhaseCollision/btPolyhedralContactClipping.cpp \
BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp \ BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp \
BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp \ BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp \
BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp \ BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp \
@@ -160,6 +162,7 @@ libBulletCollision_la_SOURCES = \
BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp \ BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp \
BulletCollision/CollisionShapes/btCompoundShape.cpp \ BulletCollision/CollisionShapes/btCompoundShape.cpp \
BulletCollision/CollisionShapes/btConeShape.cpp \ BulletCollision/CollisionShapes/btConeShape.cpp \
BulletCollision/CollisionShapes/btConvexPolyhedron.cpp \
BulletCollision/CollisionShapes/btMultiSphereShape.cpp \ BulletCollision/CollisionShapes/btMultiSphereShape.cpp \
BulletCollision/CollisionShapes/btUniformScalingShape.cpp \ BulletCollision/CollisionShapes/btUniformScalingShape.cpp \
BulletCollision/CollisionShapes/btSphereShape.cpp \ BulletCollision/CollisionShapes/btSphereShape.cpp \