Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch from openmp tasks to std::async #88

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch from openmp tasks to std::async #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions libs/tex/generate_texture_atlases.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include <set>
#include <list>
#include <future>
#include <iostream>
#include <fstream>

Expand Down Expand Up @@ -110,10 +111,7 @@ generate_texture_atlases(std::vector<TexturePatch::Ptr> * orig_texture_patches,
std::size_t remaining_patches = texture_patches.size();
std::ofstream tty("/dev/tty", std::ios_base::out);

#pragma omp parallel
{
#pragma omp single
{
std::vector<std::future<void> > futures;

while (!texture_patches.empty()) {
unsigned int texture_size = calculate_texture_size(texture_patches);
Expand Down Expand Up @@ -142,21 +140,19 @@ generate_texture_atlases(std::vector<TexturePatch::Ptr> * orig_texture_patches,
}
}

#pragma omp task
texture_atlas->finalize();
futures.push_back(std::async(std::launch::async, [texture_atlas] {
texture_atlas->finalize();
}));
}

std::cout << "\r\tWorking on atlas " << texture_atlases->size()
<< " 100%... done." << std::endl;
util::WallTimer timer;
std::cout << "\tFinalizing texture atlases... " << std::flush;
#pragma omp taskwait
std::cout << "done. (Took: " << timer.get_elapsed_sec() << "s)" << std::endl;

/* End of single region */
}
/* End of parallel region. */
for (std::future<void> & future : futures) {
future.wait();
}
std::cout << "done. (Took: " << timer.get_elapsed_sec() << "s)" << std::endl;
}

TEX_NAMESPACE_END