Fix deleting ogre2 when created (and deleted) in a thread #840
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.
🦟 Bug fix
Summary
I ran into a crash in gz-sim on exit after unloading the ogre2 render engine. It was found that it only happens if ogre-next is built with EGL support and the engine is created / deleted in a thread. The fix is to make sure EGL returns to its original state, specifically by calling
eglReleaseThread()
after deleting ogre root.The fix this PR make EGL calls which requires including and linking against the EGL library, hence the extra cmake code. The proper fix may be to do this inside ogre.
To Test:
Run the
INTEGRATION_load_unload
testChecklist
codecheck
passed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-by
messages.