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

Fix a lot of warnings, thanks to ejtttje, Fixes issue 537

Browse Source 
Fix soft body debug rendering
This commit is contained in:
erwin.coumans
2011-09-15 01:17:34 +00:00
parent 0c01816375
commit a13d22dc84
26 changed files with 80 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
View File

@@ -50,7 +50,7 @@ subject to the following restrictions:
#define LOAD_FROM_MEMORY
#ifdef LOAD_FROM_MEMORY
#define MSTRINGIFY(A) #A
static char* source=
static const char* source=
#include "ParticlesOCL.cl"
#endif //LOAD_FROM_MEMORY
@@ -363,7 +363,7 @@ void btParticlesDynamicsWorld::initCLKernels(int argc, char** argv)
printf("OpenCL compiles ParticlesOCL.cl ... ");
#else
char* fileName = "ParticlesOCL.cl";
const char* fileName = "ParticlesOCL.cl";
FILE * fp = fopen(fileName, "rb");
char newFileName[512];
@@ -426,7 +426,7 @@ void btParticlesDynamicsWorld::initCLKernels(int argc, char** argv)
// Build the program with 'mad' Optimization option
#ifdef MAC
char* flags = "-I. -DLOCAL_SIZE_MAX=1024U -cl-mad-enable -DMAC -DGUID_ARG";
const char* flags = "-I. -DLOCAL_SIZE_MAX=1024U -cl-mad-enable -DMAC -DGUID_ARG";
#else
const char* flags = "-I. -DLOCAL_SIZE_MAX=1024U -DGUID_ARG= ";
#endif
@@ -1024,7 +1024,7 @@ void btParticlesDynamicsWorld::runFindCellStartKernel()
}
void btParticlesDynamicsWorld::initKernel(int kernelId, char* pName)
void btParticlesDynamicsWorld::initKernel(int kernelId, const char* pName)
{
cl_int ciErrNum;

4
Demos/ParticlesOpenCL/btParticlesDynamicsWorld.h
View File

@@ -78,7 +78,7 @@ struct btKernelInfo
{
int m_Id;
cl_kernel m_kernel;
char* m_name;
const char* m_name;
int m_workgroupSize;
};
@@ -168,7 +168,7 @@ public:
void runFindCellStartKernel();
void runCollideParticlesKernel();
void initKernel(int kernelId, char* pName);
void initKernel(int kernelId, const char* pName);
void runKernelWithWorkgroupSize(int kernelId, int globalSize);
void bitonicSortNv(cl_mem pKey, unsigned int batch, unsigned int arrayLength, unsigned int dir);