Fix freeze-crash in lightmapper under MinGW-GCC (3.2) #45380
Merged
Conversation
This file contains 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
akien-mga
approved these changes
Jan 25, 2021
|
Thanks! |
akien-mga
added a commit
to akien-mga/godot
that referenced
this pull request
May 20, 2021
Re-do of godotengine#45380 lost in godotengine#48455. Rediff patch on current embree-aarch64 upstream. Fixes godotengine#48822.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The nightly owl strikes again against #45097.
By using a more recent version of GCC for MinGW, I've been able to get a build that fails like the last, as reported by testers, so I think the results I get with this environment may be the same as with the one for the official builds.
Regarding the issues, after some digging I've found a couple of interesting things:
_mm_pause()seems to be fine, so we don't need a replacement;I've also removed the include for
unistd.h, which I added for an older version of the patch.With these changes I've been able to get a build that succeeds in lightmapping the test projects (with no LTO; haven't tried with it enabled).
Who knows? Maybe this is the good one...
NOTE: I haven't updated the patch file for this PR.