History

add memory usage debugging

ZappoMan committed 13 years ago

Commit 605c2f31 parent eb6af1a3 files · +105 −10Browse files

Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all

Unified · Split

interface/src/Application.cpp+14−6
@@ -2822,28 +2822,36 @@ void Application::displayStats() { · 2821 unmodified lines
28222822 voxelStats << "Voxels Rendered: " << _voxels.getVoxelsRendered() / 1000.f << "K " <<
28232823 "Updated: " << _voxels.getVoxelsUpdated()/1000.f << "K " <<
28242824 "Max: " << _voxels.getMaxVoxels()/1000.f << "K ";
2825−
28262825 drawtext(10, statsVerticalOffset + 230, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
2826+
2827+ voxelStats.str("");
2828+ voxelStats << "Voxels Memory RAM: " << _voxels.getVoxelMemoryUsageRAM() / 1000000.f << "MB " <<
2829+ "VBO: " << _voxels.getVoxelMemoryUsageVBO() / 1000000.f << "MB ";
2830+ if (_voxels.hasVoxelMemoryUsageGPU()) {
2831+ voxelStats << "GPU: " << _voxels.getVoxelMemoryUsageGPU() / 1000000.f << "MB ";
2832+ }
2833+
2834+ drawtext(10, statsVerticalOffset + 250, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
28272835
28282836 voxelStats.str("");
28292837 char* voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_VOXELS);
28302838 voxelStats << "Voxels Sent from Server: " << voxelDetails;
2831− drawtext(10, statsVerticalOffset + 250, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
2839+ drawtext(10, statsVerticalOffset + 270, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
28322840
28332841 voxelStats.str("");
28342842 voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_ELAPSED);
28352843 voxelStats << "Scene Send Time from Server: " << voxelDetails;
2836− drawtext(10, statsVerticalOffset + 270, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
2844+ drawtext(10, statsVerticalOffset + 290, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
28372845
28382846 voxelStats.str("");
28392847 voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_ENCODE);
28402848 voxelStats << "Encode Time on Server: " << voxelDetails;
2841− drawtext(10, statsVerticalOffset + 290, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
2849+ drawtext(10, statsVerticalOffset + 310, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
28422850
28432851 voxelStats.str("");
28442852 voxelDetails = _voxelSceneStats.getItemValue(VoxelSceneStats::ITEM_MODE);
28452853 voxelStats << "Sending Mode: " << voxelDetails;
2846− drawtext(10, statsVerticalOffset + 310, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
2854+ drawtext(10, statsVerticalOffset + 330, 0.10f, 0, 1.0, 0, (char *)voxelStats.str().c_str());
28472855
28482856 Node *avatarMixer = NodeList::getInstance()->soloNodeOfType(NODE_TYPE_AVATAR_MIXER);
28492857 char avatarMixerStats[200];
@@ -2856,7 +2864,7 @@ void Application::displayStats() { · 6 unmodified lines
28562864 sprintf(avatarMixerStats, "No Avatar Mixer");
28572865 }
28582866
2859− drawtext(10, statsVerticalOffset + 330, 0.10f, 0, 1.0, 0, avatarMixerStats);
2867+ drawtext(10, statsVerticalOffset + 350, 0.10f, 0, 1.0, 0, avatarMixerStats);
28602868 drawtext(10, statsVerticalOffset + 450, 0.10f, 0, 1.0, 0, (char *)LeapManager::statusString().c_str());
28612869
28622870 if (_perfStatsOn) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t