History

correctly lock arrays on init

ZappoMan committed 12 years ago

Commit 601c1551 parent ed7fa6e1 file · +4 −4Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 1 file). Show all

Unified · Split

interface/src/VoxelSystem.cpp+4−4
@@ -413,8 +413,8 @@ void VoxelSystem::setupFaceIndices(GLuint& faceVBOID, GLubyte faceIdentityIndice · 412 unmodified lines
413}413}
414 414
415void VoxelSystem::initVoxelMemory() {415void VoxelSystem::initVoxelMemory() {
416 //_readArraysLock.lockForWrite();416 _readArraysLock.lockForWrite();
417 //_writeArraysLock.lockForWrite();417 _writeArraysLock.lockForWrite();
418 418
419 _memoryUsageRAM = 0;419 _memoryUsageRAM = 0;
420 _memoryUsageVBO = 0; // our VBO allocations as we know them420 _memoryUsageVBO = 0; // our VBO allocations as we know them
@@ -529,8 +529,8 @@ void VoxelSystem::initVoxelMemory() { · 108 unmodified lines
529 529
530 _initialized = true;530 _initialized = true;
531 531
532 //_writeArraysLock.unlock();532 _writeArraysLock.unlock();
533 //_readArraysLock.unlock();533 _readArraysLock.unlock();
534}534}
535 535
536void VoxelSystem::writeToSVOFile(const char* filename, VoxelTreeElement* element) const {536void VoxelSystem::writeToSVOFile(const char* filename, VoxelTreeElement* element) const {

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