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

Fix OGRE 2 with VirtualGL #794

Merged
merged 1 commit into from
Dec 21, 2022
Merged

Conversation

peci1
Copy link
Contributor

@peci1 peci1 commented Dec 20, 2022

🦟 Bug fix

Fixes #526 and maybe gazebosim/gz-sim#1746 .

Summary

Restore GLX context after loading the OGRE plugin. It is possible the loading process changes the current GLX context.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

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.

@peci1 peci1 requested a review from iche033 as a code owner December 20, 2022 21:20
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Dec 20, 2022
@codecov
Copy link

codecov bot commented Dec 20, 2022

Codecov Report

Merging #794 (a9634c6) into ign-rendering6 (74d8c78) will increase coverage by 0.01%.
The diff coverage is 100.00%.

❗ Current head a9634c6 differs from pull request most recent head 2f18450. Consider uploading reports for the commit 2f18450 to get more accurate results

@@                Coverage Diff                 @@
##           ign-rendering6     #794      +/-   ##
==================================================
+ Coverage           77.81%   77.83%   +0.01%     
==================================================
  Files                 146      146              
  Lines               13412    13416       +4     
==================================================
+ Hits                10437    10442       +5     
+ Misses               2975     2974       -1     
Impacted Files Coverage Δ
ogre2/src/Ogre2RenderEngine.cc 78.49% <100.00%> (+0.19%) ⬆️
...e/ignition/rendering/base/BaseGaussianNoisePass.hh 100.00% <0.00%> (+3.33%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

The probing process OGRE uses might change the current GLX context, e.g. when used with VirtualGL.

Signed-off-by: Martin Pecka <peckama2@fel.cvut.cz>
@peci1
Copy link
Contributor Author

peci1 commented Dec 21, 2022

I've tested this PR with all the combinations I could test - (Gazebo server with rendering sensors | Gazebo client) X (Gazebo rendering via GLX | Gazebo rendering via EGL (--headless-rendering) ) X (direct HW accelerated rendering | direct SW rendering (xvfb-run -a) | VirtualGL faking via GLX | VirtualGL faking via HW-accelerated EGL | VirtualGL faking via Mesa software EGL renderer).

@iche033
Copy link
Contributor

iche033 commented Dec 21, 2022

Thanks for the fix! I think something was went wrong on the homebrew build. Retriggered a new one.

Copy link
Contributor

@iche033 iche033 left a comment

Choose a reason for hiding this comment

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

builds looks good

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants