diff --git a/btgui/urdf/boost_replacement/string_split.cpp b/btgui/urdf/boost_replacement/string_split.cpp index bbe8146f4..6c8a294a4 100644 --- a/btgui/urdf/boost_replacement/string_split.cpp +++ b/btgui/urdf/boost_replacement/string_split.cpp @@ -1,7 +1,7 @@ #include -#include +//#include #include #include #include diff --git a/build3/premake4.lua b/build3/premake4.lua index c8b767087..985929f53 100644 --- a/build3/premake4.lua +++ b/build3/premake4.lua @@ -35,8 +35,8 @@ newoption { - trigger = "gtest", - description = "Enable unit tests using gtest" + trigger = "without-gtest", + description = "Disable unit tests using gtest" } configurations {"Release", "Debug"} @@ -95,7 +95,7 @@ language "C++" - if _OPTIONS["gtest"] then + if not _OPTIONS["without-gtest"] then include "../test/gtest-1.7.0" -- include "../test/hello_gtest" include "../test/TestBullet3OpenCL" diff --git a/test/OpenCL/AllBullet3Kernels/testCompileBullet3BroadphaseKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3BroadphaseKernels.cpp index 347a860e9..ff8ac0096 100644 --- a/test/OpenCL/AllBullet3Kernels/testCompileBullet3BroadphaseKernels.cpp +++ b/test/OpenCL/AllBullet3Kernels/testCompileBullet3BroadphaseKernels.cpp @@ -71,58 +71,58 @@ namespace cl_int errNum=0; cl_program sapProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,sapCL,&errNum,"",0,true); { - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum ); cl_kernel copyAabbsKernel= b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapCL, "copyAabbsKernel",&errNum,sapProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(copyAabbsKernel==0); clReleaseKernel(copyAabbsKernel); } { cl_kernel sap2Kernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapCL, "computePairsKernelTwoArrays",&errNum,sapProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(sap2Kernel==0); clReleaseKernel(sap2Kernel); } { cl_kernel sapKernelBruteForce = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapCL, "computePairsKernelBruteForce",&errNum,sapProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(sapKernelBruteForce==0); clReleaseKernel(sapKernelBruteForce); } { cl_kernel sapKernelOriginal = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapCL, "computePairsKernelOriginal",&errNum,sapProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(sapKernelOriginal==0); clReleaseKernel(sapKernelOriginal); } { cl_kernel sapKernelBarrier = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapCL, "computePairsKernelBarrier",&errNum,sapProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(sapKernelBarrier==0); clReleaseKernel(sapKernelBarrier); } { cl_kernel sapKernelLocalShared = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapCL, "computePairsKernelLocalSharedMemory",&errNum,sapProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(sapKernelLocalShared==0); clReleaseKernel(sapKernelLocalShared); } { cl_kernel prepareSumVarianceKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapCL, "prepareSumVarianceKernel",&errNum,sapProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(prepareSumVarianceKernel==0); clReleaseKernel(prepareSumVarianceKernel); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapCL, "flipFloatKernel",&errNum,sapProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,sapCL, "scatterKernel",&errNum,sapProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } @@ -137,28 +137,28 @@ namespace { cl_int errNum=0; cl_program gridProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,gridBroadphaseCL,&errNum,"",0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,gridBroadphaseCL, "kCalcHashAABB",&errNum,gridProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,gridBroadphaseCL, "kClearCellStart",&errNum,gridProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,gridBroadphaseCL, "kFindCellStart",&errNum,gridProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,gridBroadphaseCL, "kFindOverlappingPairs",&errNum,gridProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } diff --git a/test/OpenCL/AllBullet3Kernels/testCompileBullet3IntegrateUpdateAabbKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3IntegrateUpdateAabbKernels.cpp index 3b6f3d426..286832290 100644 --- a/test/OpenCL/AllBullet3Kernels/testCompileBullet3IntegrateUpdateAabbKernels.cpp +++ b/test/OpenCL/AllBullet3Kernels/testCompileBullet3IntegrateUpdateAabbKernels.cpp @@ -70,11 +70,11 @@ namespace cl_int errNum=0; cl_program prog = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,integrateKernelCL,&errNum,"",0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,integrateKernelCL, "integrateTransformsKernel",&errNum,prog); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } @@ -86,11 +86,11 @@ namespace { cl_int errNum=0; cl_program prog = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,updateAabbsKernelCL,&errNum,"",0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,updateAabbsKernelCL, "initializeGpuAabbsFull",&errNum,prog); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } @@ -98,7 +98,7 @@ namespace { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,updateAabbsKernelCL, "clearOverlappingPairsKernel",&errNum,prog); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } diff --git a/test/OpenCL/AllBullet3Kernels/testCompileBullet3JacobiContactSolverKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3JacobiContactSolverKernels.cpp index d9af49e90..aa2414b84 100644 --- a/test/OpenCL/AllBullet3Kernels/testCompileBullet3JacobiContactSolverKernels.cpp +++ b/test/OpenCL/AllBullet3Kernels/testCompileBullet3JacobiContactSolverKernels.cpp @@ -70,40 +70,40 @@ namespace const char* additionalMacros=""; cl_program solverUtilsProg= b3OpenCLUtils::compileCLProgramFromString( m_clContext, m_clDevice, solverUtilsCL, &errNum,additionalMacros, 0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverUtilsCL, "CountBodiesKernel", &errNum, solverUtilsProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverUtilsCL, "ContactToConstraintSplitKernel", &errNum, solverUtilsProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverUtilsCL, "ClearVelocitiesKernel", &errNum, solverUtilsProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverUtilsCL, "AverageVelocitiesKernel", &errNum, solverUtilsProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverUtilsCL, "UpdateBodyVelocitiesKernel", &errNum, solverUtilsProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } @@ -111,14 +111,14 @@ namespace { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverUtilsCL, "SolveContactJacobiKernel", &errNum, solverUtilsProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverUtilsCL, "SolveFrictionJacobiKernel", &errNum, solverUtilsProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } diff --git a/test/OpenCL/AllBullet3Kernels/testCompileBullet3NarrowphaseKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3NarrowphaseKernels.cpp index 98520fe18..491b58d79 100644 --- a/test/OpenCL/AllBullet3Kernels/testCompileBullet3NarrowphaseKernels.cpp +++ b/test/OpenCL/AllBullet3Kernels/testCompileBullet3NarrowphaseKernels.cpp @@ -75,43 +75,43 @@ namespace char flags[1024]={0}; cl_program satProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,satKernelsCL,&errNum,flags,0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel m_findSeparatingAxisKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "findSeparatingAxisKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findSeparatingAxisKernel ); } { cl_kernel m_findSeparatingAxisVertexFaceKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "findSeparatingAxisVertexFaceKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findSeparatingAxisVertexFaceKernel); } { cl_kernel m_findSeparatingAxisEdgeEdgeKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "findSeparatingAxisEdgeEdgeKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findSeparatingAxisEdgeEdgeKernel); } { cl_kernel m_findConcaveSeparatingAxisKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "findConcaveSeparatingAxisKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findConcaveSeparatingAxisKernel ); } { cl_kernel m_findCompoundPairsKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "findCompoundPairsKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findCompoundPairsKernel); } { cl_kernel m_processCompoundPairsKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "processCompoundPairsKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_processCompoundPairsKernel); } @@ -126,17 +126,17 @@ namespace char flags[1024]={0}; cl_program satConcaveProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,satConcaveKernelsCL,&errNum,flags,0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel m_findConcaveSeparatingAxisVertexFaceKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satConcaveKernelsCL, "findConcaveSeparatingAxisVertexFaceKernel",&errNum,satConcaveProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findConcaveSeparatingAxisVertexFaceKernel); } { cl_kernel m_findConcaveSeparatingAxisEdgeEdgeKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satConcaveKernelsCL, "findConcaveSeparatingAxisEdgeEdgeKernel",&errNum,satConcaveProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findConcaveSeparatingAxisEdgeEdgeKernel); } @@ -154,35 +154,35 @@ namespace //#endif cl_program satClipContactsProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,satClipKernelsCL,&errNum,flags,0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel m_clipHullHullKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "clipHullHullKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_clipHullHullKernel); } { cl_kernel m_clipCompoundsHullHullKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "clipCompoundsHullHullKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_clipCompoundsHullHullKernel); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "findClippingFacesKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "clipFacesAndFindContactsKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "clipHullHullConcaveConvexKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } @@ -190,7 +190,7 @@ namespace { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "newContactReductionKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } @@ -204,11 +204,11 @@ namespace cl_int errNum=0; cl_program bvhTraversalProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,bvhTraversalKernelCL,&errNum,"",0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,bvhTraversalKernelCL, "bvhTraversalKernel",&errNum,bvhTraversalProg,""); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } clReleaseProgram(bvhTraversalProg); @@ -218,24 +218,24 @@ namespace { cl_int errNum=0; cl_program primitiveContactsProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,primitiveContactsKernelsCL,&errNum,"",0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,primitiveContactsKernelsCL, "primitiveContactsKernel",&errNum,primitiveContactsProg,""); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,primitiveContactsKernelsCL, "findConcaveSphereContactsKernel",&errNum,primitiveContactsProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,primitiveContactsKernelsCL, "processCompoundPairsPrimitivesKernel",&errNum,primitiveContactsProg,""); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } @@ -250,17 +250,17 @@ namespace const char* srcConcave = satConcaveKernelsCL; char flags[1024]={0}; cl_program mprProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,mprKernelsCL,&errNum,flags,0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,mprKernelsCL, "mprPenetrationKernel",&errNum,mprProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,mprKernelsCL, "findSeparatingAxisUnitSphereKernel",&errNum,mprProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } diff --git a/test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsContactSolverKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsContactSolverKernels.cpp index e5ca5d1ea..4fd381a06 100644 --- a/test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsContactSolverKernels.cpp +++ b/test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsContactSolverKernels.cpp @@ -73,18 +73,18 @@ namespace const char* additionalMacros=""; cl_int errNum=0; cl_program solveFrictionProg= b3OpenCLUtils::compileCLProgramFromString( m_clContext, m_clDevice, solveFrictionCL, &errNum,additionalMacros, 0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solveFrictionCL, "BatchSolveKernelFriction", &errNum, solveFrictionProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k =b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solveFrictionCL, "solveSingleFrictionKernel", &errNum, solveFrictionProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } @@ -96,11 +96,11 @@ namespace const char* additionalMacros=""; cl_int errNum=0; cl_program solverSetupProg= b3OpenCLUtils::compileCLProgramFromString( m_clContext, m_clDevice, solverSetupCL, &errNum,additionalMacros, 0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverSetupCL, "ContactToConstraintKernel", &errNum, solverSetupProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } @@ -114,41 +114,41 @@ namespace cl_int errNum=0; cl_program solverSetup2Prog= b3OpenCLUtils::compileCLProgramFromString( m_clContext, m_clDevice, solverSetup2CL, &errNum,additionalMacros, 0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverSetup2CL, "SetSortDataKernel", &errNum, solverSetup2Prog,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverSetup2CL, "SetDeterminismSortDataBodyA", &errNum, solverSetup2Prog,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverSetup2CL, "SetDeterminismSortDataBodyB", &errNum, solverSetup2Prog,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverSetup2CL, "SetDeterminismSortDataChildShapeA", &errNum, solverSetup2Prog,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverSetup2CL, "SetDeterminismSortDataChildShapeB", &errNum, solverSetup2Prog,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } @@ -156,7 +156,7 @@ namespace { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverSetup2CL, "ReorderContactKernel", &errNum, solverSetup2Prog,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } @@ -164,7 +164,7 @@ namespace { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solverSetup2CL, "CopyConstraintKernel", &errNum, solverSetup2Prog,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } @@ -178,20 +178,20 @@ namespace cl_int errNum=0; cl_program solveContactProg= b3OpenCLUtils::compileCLProgramFromString( m_clContext, m_clDevice, solveContactCL, &errNum,additionalMacros, 0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solveContactCL, "BatchSolveKernelContact", &errNum, solveContactProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, solveContactCL, "solveSingleContactKernel", &errNum, solveContactProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } @@ -206,11 +206,11 @@ namespace cl_int errNum=0; cl_program batchingProg = b3OpenCLUtils::compileCLProgramFromString( m_clContext, m_clDevice, batchingKernelsCL, &errNum,additionalMacros, 0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, batchingKernelsCL, "CreateBatches", &errNum, batchingProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } @@ -224,11 +224,11 @@ namespace cl_int errNum=0; cl_program batchingNewProg = b3OpenCLUtils::compileCLProgramFromString( m_clContext, m_clDevice, batchingKernelsNewCL, &errNum,additionalMacros, 0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString( m_clContext, m_clDevice, batchingKernelsNewCL, "CreateBatchesNew", &errNum, batchingNewProg,additionalMacros ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } diff --git a/test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsJointSolverKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsJointSolverKernels.cpp index e0b59e374..b128962ba 100644 --- a/test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsJointSolverKernels.cpp +++ b/test/OpenCL/AllBullet3Kernels/testCompileBullet3PgsJointSolverKernels.cpp @@ -67,48 +67,48 @@ namespace cl_int errNum=0; cl_program prog = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,solveConstraintRowsCL,&errNum,"",0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,solveConstraintRowsCL, "solveJointConstraintRows",&errNum,prog); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext,m_clDevice,solveConstraintRowsCL,"initSolverBodies",&errNum,prog); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext,m_clDevice,solveConstraintRowsCL,"getInfo1Kernel",&errNum,prog); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext,m_clDevice,solveConstraintRowsCL,"initBatchConstraintsKernel",&errNum,prog); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k= b3OpenCLUtils::compileCLKernelFromString(m_clContext,m_clDevice,solveConstraintRowsCL,"getInfo2Kernel",&errNum,prog); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext,m_clDevice,solveConstraintRowsCL,"writeBackVelocitiesKernel",&errNum,prog); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext,m_clDevice,solveConstraintRowsCL,"breakViolatedConstraintsKernel",&errNum,prog); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); ASSERT_FALSE(k==0); clReleaseKernel(k); } diff --git a/test/OpenCL/AllBullet3Kernels/testCompileBullet3RaycastKernels.cpp b/test/OpenCL/AllBullet3Kernels/testCompileBullet3RaycastKernels.cpp index d3dbf4444..b30726611 100644 --- a/test/OpenCL/AllBullet3Kernels/testCompileBullet3RaycastKernels.cpp +++ b/test/OpenCL/AllBullet3Kernels/testCompileBullet3RaycastKernels.cpp @@ -68,11 +68,11 @@ namespace cl_int errNum=0; cl_program prog = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,rayCastKernelCL,&errNum,"",0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,rayCastKernelCL, "rayCastKernel",&errNum,prog); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } diff --git a/test/OpenCL/AllBullet3Kernels/testExecuteBullet3NarrowphaseKernels.cpp b/test/OpenCL/AllBullet3Kernels/testExecuteBullet3NarrowphaseKernels.cpp index 15c64196a..7756e7bb0 100644 --- a/test/OpenCL/AllBullet3Kernels/testExecuteBullet3NarrowphaseKernels.cpp +++ b/test/OpenCL/AllBullet3Kernels/testExecuteBullet3NarrowphaseKernels.cpp @@ -75,43 +75,43 @@ namespace char flags[1024]={0}; cl_program satProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,satKernelsCL,&errNum,flags,0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel m_findSeparatingAxisKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "findSeparatingAxisKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findSeparatingAxisKernel ); } { cl_kernel m_findSeparatingAxisVertexFaceKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "findSeparatingAxisVertexFaceKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findSeparatingAxisVertexFaceKernel); } { cl_kernel m_findSeparatingAxisEdgeEdgeKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "findSeparatingAxisEdgeEdgeKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findSeparatingAxisEdgeEdgeKernel); } { cl_kernel m_findConcaveSeparatingAxisKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "findConcaveSeparatingAxisKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findConcaveSeparatingAxisKernel ); } { cl_kernel m_findCompoundPairsKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "findCompoundPairsKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findCompoundPairsKernel); } { cl_kernel m_processCompoundPairsKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satKernelsCL, "processCompoundPairsKernel",&errNum,satProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_processCompoundPairsKernel); } @@ -126,17 +126,17 @@ namespace char flags[1024]={0}; cl_program satConcaveProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,satConcaveKernelsCL,&errNum,flags,0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel m_findConcaveSeparatingAxisVertexFaceKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satConcaveKernelsCL, "findConcaveSeparatingAxisVertexFaceKernel",&errNum,satConcaveProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findConcaveSeparatingAxisVertexFaceKernel); } { cl_kernel m_findConcaveSeparatingAxisEdgeEdgeKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satConcaveKernelsCL, "findConcaveSeparatingAxisEdgeEdgeKernel",&errNum,satConcaveProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_findConcaveSeparatingAxisEdgeEdgeKernel); } @@ -154,35 +154,35 @@ namespace //#endif cl_program satClipContactsProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,satClipKernelsCL,&errNum,flags,0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel m_clipHullHullKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "clipHullHullKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_clipHullHullKernel); } { cl_kernel m_clipCompoundsHullHullKernel = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "clipCompoundsHullHullKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(m_clipCompoundsHullHullKernel); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "findClippingFacesKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "clipFacesAndFindContactsKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "clipHullHullConcaveConvexKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } @@ -190,7 +190,7 @@ namespace { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,satClipKernelsCL, "newContactReductionKernel",&errNum,satClipContactsProg); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } @@ -204,11 +204,11 @@ namespace cl_int errNum=0; cl_program bvhTraversalProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,bvhTraversalKernelCL,&errNum,"",0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,bvhTraversalKernelCL, "bvhTraversalKernel",&errNum,bvhTraversalProg,""); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } clReleaseProgram(bvhTraversalProg); @@ -218,24 +218,24 @@ namespace { cl_int errNum=0; cl_program primitiveContactsProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,primitiveContactsKernelsCL,&errNum,"",0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,primitiveContactsKernelsCL, "primitiveContactsKernel",&errNum,primitiveContactsProg,""); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,primitiveContactsKernelsCL, "findConcaveSphereContactsKernel",&errNum,primitiveContactsProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,primitiveContactsKernelsCL, "processCompoundPairsPrimitivesKernel",&errNum,primitiveContactsProg,""); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } @@ -387,11 +387,11 @@ namespace const char* srcConcave = satConcaveKernelsCL; char flags[1024]={0}; cl_program mprProg = b3OpenCLUtils::compileCLProgramFromString(m_clContext,m_clDevice,mprKernelsCL,&errNum,flags,0,true); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,mprKernelsCL, "mprPenetrationKernel",&errNum,mprProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); if (1) { @@ -411,7 +411,7 @@ namespace b3OpenCLArray totalContactsOut(this->m_clContext,this->m_clQueue); totalContactsOut.setFromOpenCLBuffer(data.m_clBuffer,1); int numContacts = totalContactsOut.at(0); - ASSERT_EQ(numContacts,results[i]); + ASSERT_EQ(results[i],numContacts); } //printf("numContacts = %d\n",numContacts); @@ -427,7 +427,7 @@ namespace { cl_kernel k = b3OpenCLUtils::compileCLKernelFromString(m_clContext, m_clDevice,mprKernelsCL, "findSeparatingAxisUnitSphereKernel",&errNum,mprProg ); - ASSERT_EQ(errNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,errNum); clReleaseKernel(k); } diff --git a/test/OpenCL/BasicInitialize/testInitOpenCL.cpp b/test/OpenCL/BasicInitialize/testInitOpenCL.cpp index 37424d5f4..32b43b10a 100644 --- a/test/OpenCL/BasicInitialize/testInitOpenCL.cpp +++ b/test/OpenCL/BasicInitialize/testInitOpenCL.cpp @@ -59,7 +59,7 @@ TEST(b3OpenCLUtils, createContextFromPlatform) cl_context ctx = b3OpenCLUtils::createContextFromPlatform(platform,deviceType,&ciErrNum); ASSERT_FALSE(ctx==0); - ASSERT_EQ(ciErrNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,ciErrNum); clReleaseContext(ctx); } } @@ -83,7 +83,7 @@ TEST(b3OpenCLUtils, getDeviceAndQueue) b3Printf(" CL_PLATFORM_VERSION: \t\t\t%s\n",platformInfo.m_platformVersion); cl_context ctx = b3OpenCLUtils::createContextFromPlatform(platform,deviceType,&ciErrNum); ASSERT_FALSE(ctx==0); - ASSERT_EQ(ciErrNum,CL_SUCCESS); + ASSERT_EQ(CL_SUCCESS,ciErrNum); int numDevices = b3OpenCLUtils::getNumDevices(ctx); ASSERT_GT(numDevices,0);