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

[workspace] Upgrade vtk_internal to latest commit #21387

Merged
merged 5 commits into from
May 9, 2024

Conversation

BetsyMcPhail
Copy link
Contributor

@BetsyMcPhail BetsyMcPhail commented May 3, 2024

Towards #21372


This change is Reviewable

@jwnimmer-tri jwnimmer-tri self-assigned this May 4, 2024
@jwnimmer-tri jwnimmer-tri added priority: low status: single reviewer ok https://drake.mit.edu/reviewable.html release notes: fix This pull request contains fixes (no new features) labels May 4, 2024
Copy link
Collaborator

@jwnimmer-tri jwnimmer-tri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 1 unresolved discussion, LGTM missing from assignee jwnimmer-tri(platform), commits need curation (https://drake.mit.edu/reviewable.html#curated-commits) (waiting on @BetsyMcPhail)

a discussion (no related file):
VTK is broken upstream:

Common/Core/vtkObjectFactory.h:304:12: error: invalid 'static_cast' from type 'drake_vendor::vtkObject*' to type 'drake_vendor::vtkGLTFTexture*'
  304 |     return static_cast<thisClass*>(ret);                                                           \
      |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
IO/Geometry/vtkGLTFTexture.cxx:13:1: note: in expansion of macro 'vtkStandardNewMacro'

The vtkGLTFTexture class inherits vtkObjectBase instead of vtkObject for some reason, which means that the standard new macro cannot be used.

Hopefully someone at Kitware can fix it and then we can bump to the newer git commit here.


Copy link
Collaborator

@jwnimmer-tri jwnimmer-tri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+@rpoyner-tri for both reviews, please.

Reviewed 1 of 2 files at r1, 2 of 2 files at r2, all commit messages.
Reviewable status: LGTM missing from assignees jwnimmer-tri(platform),rpoyner-tri(platform), commits need curation (https://drake.mit.edu/reviewable.html#curated-commits) (waiting on @BetsyMcPhail)

a discussion (no related file):

Previously, jwnimmer-tri (Jeremy Nimmer) wrote…

VTK is broken upstream:

Common/Core/vtkObjectFactory.h:304:12: error: invalid 'static_cast' from type 'drake_vendor::vtkObject*' to type 'drake_vendor::vtkGLTFTexture*'
  304 |     return static_cast<thisClass*>(ret);                                                           \
      |            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
IO/Geometry/vtkGLTFTexture.cxx:13:1: note: in expansion of macro 'vtkStandardNewMacro'

The vtkGLTFTexture class inherits vtkObjectBase instead of vtkObject for some reason, which means that the standard new macro cannot be used.

Hopefully someone at Kitware can fix it and then we can bump to the newer git commit here.

The https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11117 seems sensible, so I cherry-picked it here. We can drop it at the next upgrade.


@jwnimmer-tri jwnimmer-tri removed their assignment May 9, 2024
Copy link
Contributor

@rpoyner-tri rpoyner-tri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 1 of 2 files at r1, 2 of 2 files at r2, all commit messages.
Reviewable status: commits need curation (https://drake.mit.edu/reviewable.html#curated-commits) (waiting on @BetsyMcPhail)

@jwnimmer-tri jwnimmer-tri merged commit 76e0722 into RobotLocomotion:master May 9, 2024
9 of 10 checks passed
@jwnimmer-tri jwnimmer-tri added the status: squashing now https://drake.mit.edu/reviewable.html#curated-commits label May 9, 2024
@BetsyMcPhail BetsyMcPhail deleted the update-vtk branch May 10, 2024 15:01
@BetsyMcPhail BetsyMcPhail mentioned this pull request May 16, 2024
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority: low release notes: fix This pull request contains fixes (no new features) status: single reviewer ok https://drake.mit.edu/reviewable.html status: squashing now https://drake.mit.edu/reviewable.html#curated-commits
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants