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

Jump to bottom

Concurrency changes in XAtlas #2

Merged
merged 2 commits into from
Aug 4, 2023
Merged

Concurrency changes in XAtlas #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8ecd1b
Concurrency changes in XAtlas
benedetto73 Aug 4, 2023
4408ae9
Update xatlas.h
benedetto73 Aug 4, 2023
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
11 changes: 6 additions & 5 deletions xatlas.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3235,6 +3235,8 @@ class sync_unordered_map {
}
};

const uint64_t defaultConcurrency = std::thread::hardware_concurrency() <= 1 ? 1 : std::thread::hardware_concurrency() - 1;

#if XA_MULTITHREADED
class TaskScheduler
{
Expand All @@ -3257,12 +3259,11 @@ class TaskScheduler

TaskGroup(const TaskGroup&) = default;
};

public:
TaskScheduler() : m_shutdown(false)
TaskScheduler(uint64_t threadPoolSize = defaultConcurrency) : m_shutdown(false)
{
m_threadIndex = 0;
m_workers.resize(std::thread::hardware_concurrency() <= 1 ? 1 : std::thread::hardware_concurrency() - 1);
m_workers.resize(threadPoolSize);
for (uint64_t i = 0; i < m_workers.size(); i++) {
new (&m_workers[i]) Worker();
m_workers[i].wakeup = false;
Expand Down Expand Up @@ -8965,11 +8966,11 @@ struct Context
bool uvMeshChartsComputed = false;
};

Atlas *Create()
Atlas *Create(uint64_t concurrency)
{
Context *ctx = XA_NEW(internal::MemTag::Default, Context);
memset(&ctx->atlas, 0, sizeof(Atlas));
ctx->taskScheduler = XA_NEW(internal::MemTag::Default, internal::TaskScheduler);
ctx->taskScheduler = XA_NEW_ARGS(internal::MemTag::Default, internal::TaskScheduler, concurrency);
return &ctx->atlas;
}

Expand Down
8 changes: 6 additions & 2 deletions xatlas.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,12 @@ struct Atlas
float texelsPerUnit; // Equal to PackOptions texelsPerUnit if texelsPerUnit > 0, otherwise an estimated value to match PackOptions resolution.
};

namespace internal {
extern const uint64_t defaultConcurrency;
}

// Create an empty atlas.
Atlas *Create();
Atlas *Create(uint64_t concurrency = internal::defaultConcurrency);

void Destroy(Atlas *atlas);

Expand All @@ -117,7 +121,7 @@ struct MeshDecl
const void *vertexNormalData = nullptr; // optional
const void *vertexUvData = nullptr; // optional. The input UVs are provided as a hint to the chart generator.
const void *indexData = nullptr; // optional

// Optional. Must be indexCount / 3 in length.
// Don't atlas faces set to true. Ignored faces still exist in the output meshes, Vertex uv is set to (0, 0) and Vertex atlasIndex to -1.
const bool *faceIgnoreData = nullptr;
Expand Down
Loading