Revert "Core: Switch RID_alloc::owns to lock-free"
#114963
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit bdfe854. This caused a regression for GPUParticles3D emitters on macOS arm64, which is proving to be both tricky to reproduce and solve. Other parts of the engine using RID_Owner might be affected too. Given that we're about to release 4.6, reverting might be the safest option at this time, and this optimization can be re-attempted for 4.7. Fixes godotengine#114900.
Contributor
|
Reverting fixes the problem on my M4 Pro MBP. |
bruvzg
reviewed
Jan 15, 2026
Member
bruvzg
left a comment
bruvzg
left a comment
There was a problem hiding this comment.
Reverting it is probably the most reasonable thing to do for 4.6. Since it's not consistently reproducible, it would be hard to validate if any proposed fix is fully working for everyone.
Repiteo
approved these changes
Jan 15, 2026
clayjohn
approved these changes
Jan 15, 2026
Member
clayjohn
left a comment
clayjohn
left a comment
There was a problem hiding this comment.
Looks good!
It's unfortunate to lose this optimization, but we can try again for 4.7
stuartcarnie
approved these changes
Jan 15, 2026
Contributor
stuartcarnie
left a comment
stuartcarnie
left a comment
There was a problem hiding this comment.
Can also confirm this fixes the issue on my M4 Max
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit bdfe854 / PR #112657.
This caused a regression for GPUParticles3D emitters on macOS arm64, which is proving to be both tricky to reproduce and solve. Other parts of the engine using RID_Owner might be affected too.
Given that we're about to release 4.6, reverting might be the safest option at this time, and this optimization can be re-attempted for 4.7.
Before merging this, let's see if the latest attempts in #114937 end up fruitful.
It would also be good for people who can reproduce #114900 to test this revert PR and confirm that it does solve the issue.