FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge /u/fgarlin/simgear/ branch next into next

Browse Source 
https://sourceforge.net/p/flightgear/simgear/merge-requests/62/
This commit is contained in:
James Turner
2019-06-11 21:56:28 +00:00
parent 01ac9a71b7 ab8b1d39bd
commit 098c5b0924
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/scene/viewer/ClusteredShading.cxx
View File

@@ -253,12 +253,12 @@ ClusteredShading::update(const SGLightList &light_list)
// Again, avoid the unnecessary threading overhead
threadFunc(0);
} else {
std::thread light_threads[_num_threads];
std::vector<std::thread> threads;
threads.reserve(_num_threads);
for (int i = 0; i < _num_threads; ++i)
light_threads[i] = std::thread(&ClusteredShading::threadFunc, this, i);
threads.emplace_back(&ClusteredShading::threadFunc, this, i);
for (int i = 0; i < _num_threads; ++i)
light_threads[i].join();
for (auto &t : threads) t.join();
}
// Force upload of the image data