Remove btSoftBodySolver_CPU.*

Move btSoftBodySolverData.h to src/BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h Attempt to re-enable MiniCL version of OpenCLClothDemo (cloth-capsule collision still broken) Add optional OpenCL acceleration to SerializeDemo (just for cloth)
2011-11-11 19:00:26 +00:00
parent 14352169ab
commit 66c349caa6
40 changed files with 2442 additions and 1649 deletions
--- a/Demos/SerializeDemo/AMD/CMakeLists.txt
+++ b/Demos/SerializeDemo/AMD/CMakeLists.txt
@@ -0,0 +1,131 @@
+
+
+INCLUDE_DIRECTORIES(
+${BULLET_PHYSICS_SOURCE_DIR}/src 
+${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
+${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL
+${AMD_OPENCL_INCLUDES}
+)
+
+ADD_DEFINITIONS(-DDESERIALIZE_SOFT_BODIES)
+ADD_DEFINITIONS(-DUSE_AMD_OPENCL)
+ADD_DEFINITIONS(-DCL_PLATFORM_AMD)
+IF (CMAKE_CL_64)
+	SET(CMAK_GLEW_LIBRARY
+		${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64.lib		)
+ELSE(CMAKE_CL_64)
+	SET(CMAK_GLEW_LIBRARY		${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32.lib		)
+ENDIF(CMAKE_CL_64)
+
+
+IF (USE_GLUT)
+	LINK_LIBRARIES(
+		OpenGLSupport  
+		BulletWorldImporter 
+		BulletSoftBody 
+		BulletDynamics  
+		BulletCollision 
+		BulletFileLoader 
+		LinearMath  
+		BulletSoftBodySolvers_OpenCL_AMD
+		BulletMultiThreaded
+			${GLUT_glut_LIBRARY} 
+			${OPENGL_gl_LIBRARY} 
+			${OPENGL_glu_LIBRARY}
+			${CMAK_GLEW_LIBRARY}
+			${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib
+	)
+
+	IF (WIN32)
+		ADD_EXECUTABLE(AppSerializeDemo_AMD
+			../main.cpp
+			../SerializeDemo.cpp 
+			../SerializeDemo.h
+			${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+			${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclUtils.h
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclCommon.h
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclUtils.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclCommon.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/clew.c
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/clew.h
+		
+		)
+	ELSE()
+		ADD_EXECUTABLE(AppSerializeDemo_AMD
+			../main.cpp
+			../SerializeDemo.cpp 
+			../SerializeDemo.h
+			${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclUtils.h
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclCommon.h
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclUtils.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclCommon.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/clew.c
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/clew.h
+		)
+	ENDIF()
+	IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+		IF (WIN32)
+			IF (CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppSerializeDemo_AMD
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ELSE(CMAKE_CL_64)
+				ADD_CUSTOM_COMMAND(
+					TARGET AppSerializeDemo_AMD
+					POST_BUILD
+					COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+				)
+			ENDIF(CMAKE_CL_64)
+		ENDIF(WIN32)
+	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+	
+ELSE (USE_GLUT)
+
+	LINK_LIBRARIES(
+		OpenGLSupport  
+		BulletWorldImporter 
+		BulletSoftBody 
+		BulletDynamics  
+		BulletCollision 
+		BulletFileLoader 
+		LinearMath  
+		BulletSoftBodySolvers_OpenCL_AMD
+		BulletMultiThreaded
+		${OPENGL_gl_LIBRARY} 
+		${OPENGL_glu_LIBRARY}
+		${CMAK_GLEW_LIBRARY}
+		${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib
+	)
+
+	ADD_EXECUTABLE(AppSerializeDemo_AMD
+		WIN32
+		../../OpenGL/Win32AppMain.cpp
+		../Win32SerializeDemo.cpp
+		../SerializeDemo.cpp 
+		../SerializeDemo.h
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclUtils.h
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclCommon.h
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclUtils.cpp
+		${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOclCommon.cpp
+	)
+ENDIF (USE_GLUT)
+
+IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES AND NOT INTERNAL_UPDATE_SERIALIZATION_STRUCTURES)
+	ADD_CUSTOM_COMMAND(
+		TARGET AppSerializeDemo_AMD
+		POST_BUILD
+		COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/SerializeDemo/testFile.bullet ${CMAKE_CURRENT_BINARY_DIR}/testFile.bullet
+	)
+ENDIF ()
+
+
+IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
+			SET_TARGET_PROPERTIES(AppSerializeDemo_AMD PROPERTIES  DEBUG_POSTFIX "_Debug")
+			SET_TARGET_PROPERTIES(AppSerializeDemo_AMD PROPERTIES  MINSIZEREL_POSTFIX "_MinsizeRel")
+			SET_TARGET_PROPERTIES(AppSerializeDemo_AMD PROPERTIES  RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
+ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
--- a/Demos/SerializeDemo/AMD/premake4.lua
+++ b/Demos/SerializeDemo/AMD/premake4.lua
@@ -0,0 +1,65 @@
+	
+	hasCL = findOpenCL_AMD()
+	
+	if (hasCL) then
+
+		project "AppOpenCLClothDemo_AMD"
+
+		defines { "USE_AMD_OPENCL","CL_PLATFORM_AMD"}
+
+		initOpenCL_AMD()
+	
+		language "C++"
+				
+		kind "ConsoleApp"
+		targetdir "../../.."
+
+		libdirs {"../../../Glut"}
+
+		links {
+			"LinearMath",
+			"BulletCollision",
+			"BulletDynamics", 
+			"BulletSoftBody", 
+			"BulletSoftBodySolvers_OpenCL_AMD",
+			"opengl32"
+		}
+		
+			configuration "x64"
+			links {
+				"glut64",
+				"glew64"
+			}
+			configuration "x32"
+			links {
+				"glut32",
+				"glew32"
+			}
+		
+			configuration{}
+			
+		
+			includedirs {
+			"../../../src",
+			"../../../Glut",
+			"../../SharedOpenCL",
+			"../../OpenGL"
+		}
+		
+		files {
+			"../cl_cloth_demo.cpp",
+			"../../SharedOpenCL/btOclUtils.h",
+			"../../SharedOpenCL/btOclCommon.h",
+			"../../SharedOpenCL/btOclUtils.cpp",
+			"../../SharedOpenCL/btOclCommon.cpp",
+			"../../OpenGL/GLDebugDrawer.cpp",
+			"../../OpenGL/stb_image.cpp",
+			"../../OpenGL/stb_image.h",			
+			"../gl_win.cpp",
+			"../clstuff.cpp",
+			"../clstuff.h",
+			"../gl_win.h",
+			"../cloth.h"
+		}
+		
+	end