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 for #578 on macOS / Metal #588

Merged
merged 1 commit into from
Mar 17, 2022
Merged

Conversation

srmainwaring
Copy link
Contributor

@srmainwaring srmainwaring commented Mar 17, 2022

🦟 Bug fix

Fix issue for macOS / Metal introduced in #578

Summary

#578 introduced an error on macOS / Metal for a number of examples where the parameters for the pixel shader
could not be set because the reflection pair hint was not available. This PR moves the block of code causing the issue to after the vertex shader has been created and reflection pair hint has been set.

See comment here:

Test outcome here:

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 and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

- Move setting params to after the vertex shader has been created and the shader reflection pair hint set.

Signed-off-by: Rhys Mainwaring <[email protected]>
@srmainwaring srmainwaring requested a review from iche033 as a code owner March 17, 2022 09:52
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Mar 17, 2022
@codecov
Copy link

codecov bot commented Mar 17, 2022

Codecov Report

Merging #588 (63c9939) into main (23955a9) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main     #588   +/-   ##
=======================================
  Coverage   53.43%   53.43%           
=======================================
  Files         214      214           
  Lines       21301    21301           
=======================================
  Hits        11383    11383           
  Misses       9918     9918           
Impacted Files Coverage Δ
ogre2/src/Ogre2Material.cc 73.84% <100.00%> (ø)

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 23955a9...63c9939. Read the comment docs.

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.

looks good to me. Thanks for the fix.

@iche033 iche033 merged commit 322128e into gazebosim:main Mar 17, 2022
@srmainwaring srmainwaring deleted the pr/fix-578 branch March 18, 2022 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants