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

Linux fixes

Browse Source
This commit is contained in:
erwincoumans
2013-06-17 22:45:59 -07:00
parent 227d88f553
commit a81d847c24
3 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bullet3OpenCL/ParallelPrimitives/b3OpenCLArray.h
View File

@@ -167,7 +167,6 @@ public:
if (ciErrNum!=CL_SUCCESS) if (ciErrNum!=CL_SUCCESS)
{ {
b3Error("OpenCL out-of-memory\n"); b3Error("OpenCL out-of-memory\n");
b3Assert(0);
_Count = 0; _Count = 0;
result = false; result = false;
} }

4
test/OpenCL/BasicInitialize/main.cpp
View File

@@ -124,6 +124,8 @@ int main(int argc, char* argv[])
oclCHECKERROR(ciErrNum, CL_SUCCESS); oclCHECKERROR(ciErrNum, CL_SUCCESS);
//normally you would create and execute kernels using this command queue //normally you would create and execute kernels using this command queue
{
b3OpenCLArray<char> memTester(g_cxMainContext,g_cqCommandQue,0,true); b3OpenCLArray<char> memTester(g_cxMainContext,g_cqCommandQue,0,true);
int maxMem = 8192; int maxMem = 8192;
bool result=true; bool result=true;
@@ -138,6 +140,8 @@ int main(int argc, char* argv[])
} else } else
{ {
printf("allocated %d MB failed\n", i); printf("allocated %d MB failed\n", i);
}
} }
} }

1
test/OpenCL/BasicInitialize/premake4.lua
View File

@@ -19,6 +19,7 @@ function createProject(vendor)
files { files {
"main.cpp", "main.cpp",
"../../../src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp", "../../../src/Bullet3OpenCL/Initialize/b3OpenCLUtils.cpp",
"../../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../../src/Bullet3OpenCL/Initialize/b3OpenCLUtils.h", "../../../src/Bullet3OpenCL/Initialize/b3OpenCLUtils.h",
"../../../src/Bullet3Common/b3Logging.cpp", "../../../src/Bullet3Common/b3Logging.cpp",
} }