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

Check for OpenGL backend before calling GL APIs #509

Merged
merged 2 commits into from
Dec 10, 2021

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Dec 9, 2021

Signed-off-by: Ian Chen ichen@osrfoundation.org

🦟 Bug fix

fixes issue found in this comment: gazebosim/gz-gui#323 (comment)

Summary

Now that here is support for more than just OpenGL graphics API, we should check that the OpenGL render system is actually in use before making GL calls.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • 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

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Dec 9, 2021
@iche033 iche033 changed the title Checks for OpenGL backend before calling GL APIs Check for OpenGL backend before calling GL APIs Dec 9, 2021
Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@codecov
Copy link

codecov bot commented Dec 9, 2021

Codecov Report

Merging #509 (8afca43) into ign-rendering6 (6c463bd) will increase coverage by 0.02%.
The diff coverage is 85.71%.

Impacted file tree graph

@@                Coverage Diff                 @@
##           ign-rendering6     #509      +/-   ##
==================================================
+ Coverage           55.44%   55.46%   +0.02%     
==================================================
  Files                 195      195              
  Lines               19736    19752      +16     
==================================================
+ Hits                10943    10956      +13     
- Misses               8793     8796       +3     
Impacted Files Coverage Δ
ogre2/src/Ogre2Marker.cc 40.12% <0.00%> (-0.76%) ⬇️
ogre2/src/Ogre2DepthCamera.cc 87.42% <100.00%> (+0.12%) ⬆️
ogre2/src/Ogre2LidarVisual.cc 80.95% <100.00%> (+0.27%) ⬆️
ogre2/src/Ogre2ThermalCamera.cc 89.62% <100.00%> (+0.13%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6c463bd...8afca43. Read the comment docs.

@srmainwaring
Copy link
Contributor

Checked on macOS / Metal

@chapulina chapulina merged commit aefa645 into ign-rendering6 Dec 10, 2021
@chapulina chapulina deleted the ogre2_gl_check branch December 10, 2021 00:14
ahcorde pushed a commit that referenced this pull request Dec 14, 2021
* Check for OpenGL backend before calling GL APIs (#509)

Signed-off-by: Louise Poubel <louise@openrobotics.org>

* Enable selection buffer based ray query and fix test (#510)

Signed-off-by: Ian Chen <ichen@osrfoundation.org>

* 🎈 6.1.0 (#511)

Signed-off-by: Louise Poubel <louise@openrobotics.org>

Co-authored-by: Louise Poubel <louise@openrobotics.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants