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

Do not set shader constants for textures on non-OpenGL graphics API #574

Merged
merged 2 commits into from
Mar 4, 2022

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Mar 2, 2022

🦟 Bug fix

Summary

This should fix the waves demo on macOS using ogre2 + metal. See #558 (comment)

I also had to backport the GraphicsAPI accessor function from #554

Waves demo now working again on macOS:

waves_metal

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.

@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Mar 2, 2022
@codecov
Copy link

codecov bot commented Mar 2, 2022

Codecov Report

Merging #574 (56c4300) into ign-rendering6 (e9516be) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

Impacted file tree graph

@@                Coverage Diff                 @@
##           ign-rendering6     #574      +/-   ##
==================================================
- Coverage           54.38%   54.36%   -0.02%     
==================================================
  Files                 198      198              
  Lines               20152    20157       +5     
==================================================
  Hits                10959    10959              
- Misses               9193     9198       +5     
Impacted Files Coverage Δ
...lude/ignition/rendering/ogre2/Ogre2RenderEngine.hh 100.00% <ø> (ø)
ogre2/src/Ogre2Material.cc 64.88% <0.00%> (-0.36%) ⬇️
ogre2/src/Ogre2RenderEngine.cc 77.92% <0.00%> (-0.36%) ⬇️

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 e9516be...56c4300. Read the comment docs.

@iche033 iche033 merged commit 996c58d into ign-rendering6 Mar 4, 2022
@iche033 iche033 deleted the set_param_metal branch March 4, 2022 19:17
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.

2 participants