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

--update magnum deps for texture semantic shader support #1640

Merged
merged 3 commits into from
Jan 27, 2022

Conversation

jturner65
Copy link
Contributor

@jturner65 jturner65 commented Jan 27, 2022

Motivation and Context

Updates Magnum deps to include shader-based semantic texture id processing. Pending on final update :)

How Has This Been Tested

locally c++ and python tests

Types of changes

  • Docs change / refactoring / dependency upgrade
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have completed my CLA (see CONTRIBUTING)
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@jturner65 jturner65 requested a review from mosra January 27, 2022 19:42
@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Jan 27, 2022
@jturner65 jturner65 marked this pull request as draft January 27, 2022 19:44
@mosra
Copy link
Collaborator

mosra commented Jan 27, 2022

Heh, and the code indeed did hit the only breaking change I made there. I hoped it wouldn't.

/home/circleci/project/habitat-sim/src/esp/assets/GenericMeshData.cpp:69:32: error: no match for ‘operator=’

Change this:

collisionMeshData_.indices = meshData_->mutableIndices<Mn::UnsignedInt>();

to this, and similarly in other places if those fail the same way:

  collisionMeshData_.indices = meshData_->mutableIndices<Mn::UnsignedInt>().asContiguous(); 

The remaining Magnum changes got just merged, so you can update the submodule to mosra/magnum@5f16354.

@mosra
Copy link
Collaborator

mosra commented Jan 27, 2022

Oh also, there's a new Utility::String::parseNumberSequence(), which is now used in TestSuite --only and --except arguments. Useful to quickly run just a subset of test cases (--only 244-260, for example) if you have huge or slow tests (which was the case for the shader stuff).

@jturner65 jturner65 marked this pull request as ready for review January 27, 2022 20:14
@jturner65 jturner65 merged commit 4ac7c19 into facebookresearch:main Jan 27, 2022
@jturner65 jturner65 deleted the magnum_update branch January 27, 2022 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed Do not delete this pull request or issue due to inactivity.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants