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

Disable btQuickprof.h profiling by default. We use custom profiling functions, see b3ChromeUtilsStartTimings.

Browse Source
This commit is contained in:
erwincoumans
2018-11-01 08:19:50 -07:00
parent 336a4b65fe
commit 750133694c
5 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/ExampleBrowser/OpenGLExampleBrowser.cpp
View File

@@ -251,7 +251,6 @@ void MyKeyboardCallback(int key, int state)
if (key == 'p')
{
#ifndef BT_NO_PROFILE
if (state)
{
b3ChromeUtilsStartTimings();
@@ -260,7 +259,6 @@ void MyKeyboardCallback(int key, int state)
{
b3ChromeUtilsStopTimingsAndWriteJsonFile("timings");
}
#endif //BT_NO_PROFILE
}
#ifndef NO_OPENGL3
@@ -1129,6 +1127,7 @@ bool OpenGLExampleBrowser::init(int argc, char* argv[])
gui2->registerFileOpenCallback(fileOpenCallback);
gui2->registerQuitCallback(quitCallback);
}
return true;

4
examples/SharedMemory/SharedMemoryPublic.h
View File

@@ -928,7 +928,7 @@ enum eFileIOTypes
};
//limits for vertices/indices in PyBullet::createCollisionShape
#define B3_MAX_NUM_VERTICES 1024
#define B3_MAX_NUM_INDICES 1024
#define B3_MAX_NUM_VERTICES 16
#define B3_MAX_NUM_INDICES 16
#endif //SHARED_MEMORY_PUBLIC_H

8
examples/Utils/ChromeTraceUtil.cpp
View File

@@ -174,7 +174,7 @@ void MyEnterProfileZoneFunc(const char* msg)
{
if (gProfileDisabled)
return;
#ifndef BT_NO_PROFILE
int threadId = btQuickprofGetCurrentThreadIndex2();
if (threadId < 0 || threadId >= BT_QUICKPROF_MAX_THREAD_COUNT)
return;
@@ -191,13 +191,13 @@ void MyEnterProfileZoneFunc(const char* msg)
gStartTimes[threadId][gStackDepths[threadId]] = 1 + gStartTimes[threadId][gStackDepths[threadId] - 1];
}
gStackDepths[threadId]++;
#endif
}
void MyLeaveProfileZoneFunc()
{
if (gProfileDisabled)
return;
#ifndef BT_NO_PROFILE
int threadId = btQuickprofGetCurrentThreadIndex2();
if (threadId < 0 || threadId >= BT_QUICKPROF_MAX_THREAD_COUNT)
return;
@@ -214,7 +214,7 @@ void MyLeaveProfileZoneFunc()
unsigned long long int endTime = clk.getTimeNanoseconds();
gTimings[threadId].addTiming(name, threadId, startTime, endTime);
#endif //BT_NO_PROFILE
}
void b3ChromeUtilsStartTimings()