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

remove some debug printf's from kernel (stringify doesn't handle it properly)

Browse Source
This commit is contained in:
erwincoumans
2013-07-15 10:36:02 -07:00
parent a5d00c8219
commit 20f9e41ff0
4 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Bullet3OpenCL/RigidBody/b3GpuBatchingPgsSolver.cpp
View File

@@ -135,10 +135,9 @@ b3GpuBatchingPgsSolver::b3GpuBatchingPgsSolver(cl_context ctx,cl_device_id devic
const char* solveFrictionSource = solveFrictionCL; const char* solveFrictionSource = solveFrictionCL;
{ {
cl_program solveContactProg= b3OpenCLUtils::compileCLProgramFromString( ctx, device, 0, &pErrNum,additionalMacros, B3_SOLVER_CONTACT_KERNEL_PATH,true); cl_program solveContactProg= b3OpenCLUtils::compileCLProgramFromString( ctx, device, solveContactSource, &pErrNum,additionalMacros, B3_SOLVER_CONTACT_KERNEL_PATH);
b3Assert(solveContactProg); b3Assert(solveContactProg);
cl_program solveFrictionProg= b3OpenCLUtils::compileCLProgramFromString( ctx, device, solveFrictionSource, &pErrNum,additionalMacros, B3_SOLVER_FRICTION_KERNEL_PATH); cl_program solveFrictionProg= b3OpenCLUtils::compileCLProgramFromString( ctx, device, solveFrictionSource, &pErrNum,additionalMacros, B3_SOLVER_FRICTION_KERNEL_PATH);

8
src/Bullet3OpenCL/RigidBody/kernels/solveContact.cl
View File

@@ -447,8 +447,6 @@ void BatchSolveKernelContact(__global Body* gBodies,
const int end = start + gN[cellIdx]; const int end = start + gN[cellIdx];
//if (lIdx==0)
//printf("wgIdx = %d, start = %d, end=%d\n",wgIdx,start,end);
if( lIdx == 0 ) if( lIdx == 0 )
@@ -468,9 +466,6 @@ void BatchSolveKernelContact(__global Body* gBodies,
{ {
if (gConstraints[idx].m_batchIdx == ldsCurBatch) if (gConstraints[idx].m_batchIdx == ldsCurBatch)
{ {
//if (wgIdx==0 && lIdx==0)
//printf("solved wgIdx=%d, ldsCurBatch=%d idx=%d \n", wgIdx, ldsCurBatch,idx);
solveContactConstraint( gBodies, gShapes, &gConstraints[idx] ); solveContactConstraint( gBodies, gShapes, &gConstraints[idx] );
idx+=64; idx+=64;
@@ -480,8 +475,7 @@ void BatchSolveKernelContact(__global Body* gBodies,
} }
} }
GROUP_LDS_BARRIER; GROUP_LDS_BARRIER;
// if (wgIdx==0 && lIdx==0)
// printf("-----------------------\n");
if( lIdx == 0 ) if( lIdx == 0 )
{ {
ldsCurBatch++; ldsCurBatch++;

10
src/Bullet3OpenCL/RigidBody/kernels/solveContact.h
View File

@@ -449,9 +449,7 @@ static const char* solveContactCL= \
" const int end = start + gN[cellIdx];\n" " const int end = start + gN[cellIdx];\n"
"\n" "\n"
" \n" " \n"
" //if (lIdx==0)\n" " \n"
" //printf(\"wgIdx = %d, start = %d, end=%d\n\",wgIdx,start,end);\n"
"\n"
" \n" " \n"
" if( lIdx == 0 )\n" " if( lIdx == 0 )\n"
" {\n" " {\n"
@@ -470,9 +468,6 @@ static const char* solveContactCL= \
" {\n" " {\n"
" if (gConstraints[idx].m_batchIdx == ldsCurBatch)\n" " if (gConstraints[idx].m_batchIdx == ldsCurBatch)\n"
" {\n" " {\n"
" //if (wgIdx==0 && lIdx==0)\n"
" //printf(\"solved wgIdx=%d, ldsCurBatch=%d idx=%d \n\", wgIdx, ldsCurBatch,idx);\n"
" \n"
" solveContactConstraint( gBodies, gShapes, &gConstraints[idx] );\n" " solveContactConstraint( gBodies, gShapes, &gConstraints[idx] );\n"
"\n" "\n"
" idx+=64;\n" " idx+=64;\n"
@@ -482,8 +477,7 @@ static const char* solveContactCL= \
" }\n" " }\n"
" }\n" " }\n"
" GROUP_LDS_BARRIER;\n" " GROUP_LDS_BARRIER;\n"
" // if (wgIdx==0 && lIdx==0)\n" " \n"
" // printf(\"-----------------------\n\");\n"
" if( lIdx == 0 )\n" " if( lIdx == 0 )\n"
" {\n" " {\n"
" ldsCurBatch++;\n" " ldsCurBatch++;\n"