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.

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

Update xatlas to latest upstream commit (b7d7bb9). #30129

Merged
merged 1 commit into from
Jul 11, 2019

Conversation

fire
Copy link
Member

@fire fire commented Jun 27, 2019

Update xatlas to 1681e63

@fire fire requested a review from akien-mga as a code owner June 27, 2019 16:47
@fire
Copy link
Member Author

fire commented Jun 27, 2019

Needs testing, not sure if we require the per triangle code.

@fire
Copy link
Member Author

fire commented Jun 27, 2019

Reminder to remove patch files when close to done.

@fire
Copy link
Member Author

fire commented Jun 27, 2019

This is confusing.

thirdparty\xatlas\xatlas.cpp(2338): note: see reference to class template instantiation 'xatlas::internal::task::ObjectPool<xatlas::internal::task::Scheduler::Counter>::D' being compiled
thirdparty\xatlas\xatlas.cpp(2331): note: while compiling class template member function 'bool xatlas::internal::task::ObjectPool<xatlas::internal::task::Scheduler::Counter>::ref(uint32_t) const'
thirdparty\xatlas\xatlas.cpp(2470): note: see reference to function template instantiation 'bool xatlas::internal::task::ObjectPool<xatlas::internal::task::Scheduler::Counter>::ref(uint32_t) const' being compiled
thirdparty\xatlas\xatlas.cpp(2673): note: see reference to class template instantiation 'xatlas::internal::task::ObjectPool<xatlas::internal::task::Scheduler::Counter>' being compiled
thirdparty\xatlas\xatlas.cpp(2379): error C2065: 'state': undeclared identifier
thirdparty\xatlas\xatlas.cpp(2379): error C2327: 'xatlas::internal::task::ObjectPool<xatlas::internal::task::Scheduler::Counter>::D::version': is not a type name, static, or enumerator
thirdparty\xatlas\xatlas.cpp(2379): error C2065: 'version': undeclared identifier
thirdparty\xatlas\xatlas.cpp(2379): error C2327: 'xatlas::internal::task::ObjectPool<xatlas::internal::task::Scheduler::Counter>::D::element': is not a type name, static, or enumerator
thirdparty\xatlas\xatlas.cpp(2379): error C2065: 'element': undeclared identifier
scons: *** [thirdparty\xatlas\xatlas.windows.opt.tools.64.obj] Error 2
scons: building terminated because of errors.

@fire
Copy link
Member Author

fire commented Jun 28, 2019

What that means is that msvc 2017 is required and msvc 2015 isn't supported?

@akien-mga
Copy link
Member

I'd prefer that we keep supporting MSVC 2015 for the time being, even though using 2017 or later is definitely recommended.

@jpcy
Copy link

jpcy commented Jul 1, 2019

xatlas::MeshDecl data fields don't need to be allocated, you could assign them to p_indices, p_vertices etc. directly instead.

@fire
Copy link
Member Author

fire commented Jul 1, 2019

@jpcy Can you see why the system is limited to one core?

@jpcy
Copy link

jpcy commented Jul 1, 2019

Multithreaded tasks aren't very finely grained at this point. A single mesh where all faces are connected will only use one core. I should be able to improve that soon, but I need to swap out the current task scheduler with one that can create sub tasks from any thread first.

@akien-mga akien-mga changed the title [WIP] Update xatlas to 1681e63. [WIP] Update xatlas to latest upstream commit (1efe581). Jul 3, 2019
@akien-mga akien-mga requested a review from JFonS July 3, 2019 06:42
@fire
Copy link
Member Author

fire commented Jul 9, 2019

Will test jpcy/xatlas@b7d7bb9 for performance changes.

Copy link
Contributor

@JFonS JFonS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fire
Copy link
Member Author

fire commented Jul 11, 2019

Regarding performance improvements, there are still changes in jpcy/xatlas#22 and the repository.

However, at this very moment, there is no difference in performance between the master and this pull request. Both are still single core locked. So we should be ok to merge and when xatlas has the performance improvement, we can pull request again.

@akien-mga
Copy link
Member

Sounds good to me, let's merge :)

@fire fire changed the title [WIP] Update xatlas to latest upstream commit (1efe581). Update xatlas to latest upstream commit (b7d7bb9). Jul 11, 2019
@akien-mga akien-mga merged commit eb98c5e into godotengine:master Jul 11, 2019
@akien-mga
Copy link
Member

Thanks!

@fire fire deleted the xatlas_update branch July 11, 2019 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants