rename gpu_sat -> gpu_narrowphase

build/premake4.lua

@@ -102,7 +102,7 @@
 --		include "../opencl/lds_bank_conflict"
 --		include "../opencl/reduce"
 --		include "../opencl/gpu_broadphase/test"
---		include "../opencl/gpu_sat/test"
+--		include "../opencl/gpu_narrowphase/test"
 		include "../btgui/Gwen"
 		include "../btgui/GwenOpenGLTest"
 --		include "../btgui/OpenGLTrueTypeFont"

demo/gpudemo/premake4.lua

@@ -64,8 +64,8 @@ function createProject(vendor)
 			"../../opencl/basic_initialize/btOpenCLUtils.cpp",
 			"../../opencl/basic_initialize/btOpenCLUtils.h",
 			"../../opencl/gpu_broadphase/host/btGpuSapBroadphase.cpp",
-			"../../opencl/gpu_sat/host/**.cpp",
+			"../../opencl/gpu_narrowphase/host/**.cpp",
-			"../../opencl/gpu_sat/host/**.h",
+			"../../opencl/gpu_narrowphase/host/**.h",
 			"../../opencl/parallel_primitives/host/btBoundSearchCL.cpp",
 			"../../opencl/parallel_primitives/host/btBoundSearchCL.h",
 			"../../opencl/parallel_primitives/host/btFillCL.cpp",

opencl/gpu_narrowphase/host/ConvexHullContact.cpp

@@ -60,10 +60,10 @@ m_totalContactsOut(m_context, m_queue)
 
 		char flags[1024]={0};
 //#ifdef CL_PLATFORM_INTEL
-//		sprintf(flags,"-g -s \"%s\"","C:/develop/bullet3_experiments2/opencl/gpu_sat/kernels/sat.cl");
+//		sprintf(flags,"-g -s \"%s\"","C:/develop/bullet3_experiments2/opencl/gpu_narrowphase/kernels/sat.cl");
 //#endif
 
-		cl_program satProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,src,&errNum,flags,"opencl/gpu_sat/kernels/sat.cl");
+		cl_program satProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,src,&errNum,flags,"opencl/gpu_narrowphase/kernels/sat.cl");
 		btAssert(errNum==CL_SUCCESS);
 
 		m_findSeparatingAxisKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,src, "findSeparatingAxisKernel",&errNum,satProg );
@@ -88,10 +88,10 @@ m_totalContactsOut(m_context, m_queue)
 
 		char flags[1024]={0};
 //#ifdef CL_PLATFORM_INTEL
-//		sprintf(flags,"-g -s \"%s\"","C:/develop/bullet3_experiments2/opencl/gpu_sat/kernels/satClipHullContacts.cl");
+//		sprintf(flags,"-g -s \"%s\"","C:/develop/bullet3_experiments2/opencl/gpu_narrowphase/kernels/satClipHullContacts.cl");
 //#endif
 
-		cl_program satClipContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcClip,&errNum,flags,"opencl/gpu_sat/kernels/satClipHullContacts.cl");
+		cl_program satClipContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcClip,&errNum,flags,"opencl/gpu_narrowphase/kernels/satClipHullContacts.cl");
 		btAssert(errNum==CL_SUCCESS);
 
 		m_clipHullHullKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,srcClip, "clipHullHullKernel",&errNum,satClipContactsProg);
@@ -131,7 +131,7 @@ m_totalContactsOut(m_context, m_queue)
 	 if (1)
 	{
 		const char* srcBvh = bvhTraversalKernelCL;
-		cl_program bvhTraversalProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcBvh,&errNum,"","opencl/gpu_sat/kernels/bvhTraversal.cl");
+		cl_program bvhTraversalProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,srcBvh,&errNum,"","opencl/gpu_narrowphase/kernels/bvhTraversal.cl");
 		btAssert(errNum==CL_SUCCESS);
 
 		m_bvhTraversalKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,srcBvh, "bvhTraversalKernel",&errNum,bvhTraversalProg,"");
@@ -141,7 +141,7 @@ m_totalContactsOut(m_context, m_queue)
         
 	 {
 		 const char* primitiveContactsSrc = primitiveContactsKernelsCL;
-		cl_program primitiveContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,primitiveContactsSrc,&errNum,"","opencl/gpu_sat/kernels/primitiveContacts.cl");
+		cl_program primitiveContactsProg = btOpenCLUtils::compileCLProgramFromString(m_context,m_device,primitiveContactsSrc,&errNum,"","opencl/gpu_narrowphase/kernels/primitiveContacts.cl");
 		btAssert(errNum==CL_SUCCESS);
 
 		m_primitiveContactsKernel = btOpenCLUtils::compileCLKernelFromString(m_context, m_device,primitiveContactsSrc, "primitiveContactsKernel",&errNum,primitiveContactsProg,"");

opencl/gpu_rigidbody/host/Solver.h

@@ -19,8 +19,8 @@ subject to the following restrictions:
 
 #include "../../parallel_primitives/host/btOpenCLArray.h"
 #include "../host/btGpuConstraint4.h"
-#include "../../gpu_sat/host/btRigidBodyCL.h"
+#include "../../gpu_narrowphase/host/btRigidBodyCL.h"
-#include "../../gpu_sat/host/btContact4.h"
+#include "../../gpu_narrowphase/host/btContact4.h"
 
 #include "../host/btGpuConstraint4.h"
 #include "../../parallel_primitives/host/btPrefixScanCL.h"

opencl/gpu_rigidbody/host/btGpuBatchingPgsSolver.h

@@ -4,8 +4,8 @@
 
 #include "../../basic_initialize/btOpenCLInclude.h"
 #include "../../parallel_primitives/host/btOpenCLArray.h"
-#include "../../gpu_sat/host/btRigidBodyCL.h"
+#include "../../gpu_narrowphase/host/btRigidBodyCL.h"
-#include "../../gpu_sat/host/btContact4.h"
+#include "../../gpu_narrowphase/host/btContact4.h"
 #include "btGpuConstraint4.h"
 
 class btGpuBatchingPgsSolver

opencl/gpu_rigidbody/host/btGpuJacobiSolver.h

@@ -3,8 +3,8 @@
 #define BT_GPU_JACOBI_SOLVER_H
 #include "../../basic_initialize/btOpenCLUtils.h"
 
-#include "../../gpu_sat/host/btRigidBodyCL.h"
+#include "../../gpu_narrowphase/host/btRigidBodyCL.h"
-#include "../../gpu_sat/host/btContact4.h"
+#include "../../gpu_narrowphase/host/btContact4.h"
 #include "../../parallel_primitives/host/btOpenCLArray.h"
 
 class btTypedConstraint;

opencl/gpu_rigidbody/host/btGpuNarrowPhase.cpp

@@ -2,13 +2,13 @@
 
 
 #include "parallel_primitives/host/btOpenCLArray.h"
-#include "../../gpu_sat/host/btConvexPolyhedronCL.h"
+#include "../../gpu_narrowphase/host/btConvexPolyhedronCL.h"
-#include "../../gpu_sat/host/ConvexHullContact.h"
+#include "../../gpu_narrowphase/host/ConvexHullContact.h"
 #include "../../gpu_broadphase/host/btSapAabb.h"
 #include <string.h>
 #include "btConfig.h"
-#include "../../gpu_sat/host/btOptimizedBvh.h"
+#include "../../gpu_narrowphase/host/btOptimizedBvh.h"
-#include "../../gpu_sat/host/btTriangleIndexVertexArray.h"
+#include "../../gpu_narrowphase/host/btTriangleIndexVertexArray.h"
 #include "BulletGeometry/btAabbUtil2.h"
 
 struct btGpuNarrowPhaseInternalData

opencl/gpu_rigidbody/host/btGpuNarrowPhase.h

@@ -1,7 +1,7 @@
 #ifndef BT_GPU_NARROWPHASE_H
 #define BT_GPU_NARROWPHASE_H
 
-#include "../../gpu_sat/host/btCollidable.h"
+#include "../../gpu_narrowphase/host/btCollidable.h"
 #include "basic_initialize/btOpenCLInclude.h"
 #include "BulletCommon/btAlignedObjectArray.h"
 #include "BulletCommon/btVector3.h"

opencl/gpu_rigidbody/host/btGpuRigidBodyPipeline.cpp

@@ -10,8 +10,8 @@
 #include "../../gpu_broadphase/host/btGpuSapBroadphase.h"
 #include "parallel_primitives/host/btLauncherCL.h"
 #include "btPgsJacobiSolver.h"
-#include "../../gpu_sat/host/btRigidBodyCL.h"
+#include "../../gpu_narrowphase/host/btRigidBodyCL.h"
-#include "../../gpu_sat/host/btContact4.h"
+#include "../../gpu_narrowphase/host/btContact4.h"
 #include "btGpuBatchingPgsSolver.h"
 #include "Solver.h"
 #include "btGpuJacobiSolver.h"

opencl/gpu_rigidbody/host/btGpuRigidBodyPipelineInternalData.h

@@ -5,7 +5,7 @@
 #include "BulletCommon/btAlignedObjectArray.h"
 
 #include "../../parallel_primitives/host/btOpenCLArray.h"
-#include "../../gpu_sat/host/btCollidable.h"
+#include "../../gpu_narrowphase/host/btCollidable.h"
 
 
 struct btGpuRigidBodyPipelineInternalData

opencl/gpu_rigidbody/host/btPgsJacobiSolver.cpp

@@ -31,14 +31,14 @@ subject to the following restrictions:
 #include "BulletCommon/btAlignedObjectArray.h"
 #include <string.h> //for memset
 //#include "../../dynamics/basic_demo/Stubs/AdlContact4.h"
-#include "../../gpu_sat/host/btContact4.h"
+#include "../../gpu_narrowphase/host/btContact4.h"
 
 bool usePgs = false;//true;
 int		gNumSplitImpulseRecoveries2 = 0;
 
 #include "btRigidBody.h"
 //#include "../../dynamics/basic_demo/Stubs/AdlRigidBody.h"
-#include "../../gpu_sat/host/btRigidBodyCL.h"
+#include "../../gpu_narrowphase/host/btRigidBodyCL.h"
 
 btTransform	getWorldTransform(btRigidBodyCL* rb)
 {