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 shader params system on macOS #1713

Merged
merged 3 commits into from
Sep 26, 2022
Merged

Fix shader params system on macOS #1713

merged 3 commits into from
Sep 26, 2022

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Sep 15, 2022

🦟 Bug fix

Summary

Loading the shader_param.sdf example world file currently crashes on macOS as it tries to compile glsl shaders before the metal shaders. This PR checks the current rendering API and only try to load the correct shader type.

to test, launch shader_param.sdf world on macOS and it should no longer crash

# in one terminal
gz sim -s -v 4 shader_param.sdf

# in another terminal
gz sim -v 4  -g

shader_param_macos sdf

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.

@github-actions github-actions bot added the 🌱 garden Ignition Garden label Sep 15, 2022
Signed-off-by: Ian Chen <[email protected]>
@codecov
Copy link

codecov bot commented Sep 15, 2022

Codecov Report

Merging #1713 (4c1200d) into gz-sim7 (22b7852) will increase coverage by 0.02%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           gz-sim7    #1713      +/-   ##
===========================================
+ Coverage    63.90%   63.93%   +0.02%     
===========================================
  Files          334      334              
  Lines        26344    26333      -11     
===========================================
  Hits         16836    16836              
+ Misses        9508     9497      -11     
Impacted Files Coverage Δ
python/src/gz/sim/_gz_sim_pybind11.cc 100.00% <0.00%> (+50.00%) ⬆️

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

Signed-off-by: Nate Koenig <[email protected]>
@mjcarroll mjcarroll merged commit e3ce554 into gz-sim7 Sep 26, 2022
@mjcarroll mjcarroll deleted the shader_param_mac branch September 26, 2022 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants