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

thorvg: Re-enable thread support, made opt-in upstream #88053

Merged

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga added bug topic:thirdparty regression cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Feb 7, 2024
@akien-mga akien-mga added this to the 4.3 milestone Feb 7, 2024
@akien-mga akien-mga requested a review from a team as a code owner February 7, 2024 11:16
@@ -38,10 +38,10 @@ namespace tvg {
{
Key* key = nullptr;

ScopedLock(Key& key)
ScopedLock(Key& p_key)
Copy link
Member Author

Choose a reason for hiding this comment

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

@hermet FYI, I was getting a -Wshadow warning from GCC here.
Happy to make a PR upstream if this kind of change looks acceptable, possibly with a different naming convention if there's one you favor.

@akien-mga
Copy link
Member Author

I'll yolo merge as I'm about to build 4.3-dev3 and would like this regression fixed in that build.

@akien-mga akien-mga merged commit 36e943b into godotengine:master Feb 7, 2024
15 checks passed
@akien-mga akien-mga deleted the thorvg-reenable-thread-support branch February 7, 2024 11:26
@capnm
Copy link
Contributor

capnm commented Feb 7, 2024

I forgot that this is only default within the meson, sorry.

@akien-mga
Copy link
Member Author

Cherry-picked for 4.2.2.

@akien-mga akien-mga removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Mar 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants