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

more bt* to b3*

Browse Source
This commit is contained in:
erwin coumans
2013-04-16 17:08:59 -07:00
parent faabffc23d
commit e646754228
116 changed files with 2466 additions and 3034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opencl/parallel_primitives/benchmark/premake4.lua
View File

@@ -24,11 +24,11 @@ function createProject(vendor)
"../host/btFillCL.cpp",
"../host/btPrefixScanCL.cpp",
"../host/btRadixSort32CL.cpp",
"../../../src/BulletCommon/btAlignedAllocator.cpp",
"../../../src/BulletCommon/btAlignedAllocator.h",
"../../../src/BulletCommon/btAlignedObjectArray.h",
"../../../src/BulletCommon/btQuickprof.cpp",
"../../../src/BulletCommon/btQuickprof.h",
"../../../src/BulletCommon/b3AlignedAllocator.cpp",
"../../../src/BulletCommon/b3AlignedAllocator.h",
"../../../src/BulletCommon/b3AlignedObjectArray.h",
"../../../src/BulletCommon/b3Quickprof.cpp",
"../../../src/BulletCommon/b3Quickprof.h",
}
end

20
opencl/parallel_primitives/benchmark/test_large_problem_sorting.cpp
View File

@@ -66,7 +66,7 @@
#include "../host/btRadixSort32CL.h"
#include "../../basic_initialize/b3OpenCLUtils.h"
#include "BulletCommon/btQuickprof.h"
#include "BulletCommon/b3Quickprof.h"
cl_context g_cxMainContext;
cl_device_id g_device;
@@ -112,7 +112,7 @@ void TimedSort(
printf("Keys only, %d iterations, %d elements\n", iterations, num_elements);
int max_elements = num_elements;
btAlignedObjectArray<unsigned int> hostData;
b3AlignedObjectArray<unsigned int> hostData;
hostData.resize(num_elements);
for (int i=0;i<num_elements;i++)
{
@@ -126,7 +126,7 @@ void TimedSort(
//sorter.executeHost(gpuData);
sorter.execute(gpuData);
btAlignedObjectArray<unsigned int> hostDataSorted;
b3AlignedObjectArray<unsigned int> hostDataSorted;
gpuData.copyToHost(hostDataSorted);
clFinish(g_cqCommandQueue);
@@ -218,7 +218,7 @@ void TimedSort(
printf("Key-values, %d iterations, %d elements\n", iterations, num_elements);
int max_elements = num_elements;
btAlignedObjectArray<btSortData> hostData;
b3AlignedObjectArray<btSortData> hostData;
hostData.resize(num_elements);
for (int i=0;i<num_elements;i++)
{
@@ -233,7 +233,7 @@ void TimedSort(
//sorter.executeHost(gpuData);
sorter.execute(gpuData);
btAlignedObjectArray<btSortData> hostDataSorted;
b3AlignedObjectArray<btSortData> hostDataSorted;
gpuData.copyToHost(hostDataSorted);
#if 0
for (int i=0;i<num_elements;i++)
@@ -549,7 +549,7 @@ void Usage()
#include <algorithm>
#include <string>
class CommandLineArgs
class b3CommandLineArgs
{
protected:
@@ -558,7 +558,7 @@ protected:
public:
// Constructor
CommandLineArgs(int argc, char **argv)
b3CommandLineArgs(int argc, char **argv)
{
using namespace std;
@@ -603,7 +603,7 @@ public:
};
template <typename T>
void CommandLineArgs::GetCmdLineArgument(const char *arg_name, T &val)
void b3CommandLineArgs::GetCmdLineArgument(const char *arg_name, T &val)
{
using namespace std;
map<string, string>::iterator itr;
@@ -614,7 +614,7 @@ void CommandLineArgs::GetCmdLineArgument(const char *arg_name, T &val)
}
template <>
void CommandLineArgs::GetCmdLineArgument<char*>(const char* arg_name, char* &val)
void b3CommandLineArgs::GetCmdLineArgument<char*>(const char* arg_name, char* &val)
{
using namespace std;
map<string, string>::iterator itr;
@@ -644,7 +644,7 @@ int main( int argc, char** argv)
gDebugSkipLoadingBinary = true;
cl_int ciErrNum;
CommandLineArgs args(argc,argv);
b3CommandLineArgs args(argc,argv);
args.GetCmdLineArgument("deviceId", gPreferredDeviceId);
args.GetCmdLineArgument("platformId", gPreferredPlatformId);