Skip to content

[workspace] Upgrade vtk_internal to latest commit #23038

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[workspace] Upgrade vtk_internal to latest commit #23038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions tools/workspace/vtk_internal/patches/upstream/io_import_errors.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[vtk] Restore IO import error forwarding

Feed through the proper observers as opposed to raising globally.

--- IO/Import/vtkGLTFImporter.cxx
+++ IO/Import/vtkGLTFImporter.cxx
@@ -417,6 +417,8 @@ int vtkGLTFImporter::ImportBegin()
vtkNew<vtkEventForwarderCommand> forwarder;
forwarder->SetTarget(this);
this->Loader->AddObserver(vtkCommand::ProgressEvent, forwarder);
+ this->Loader->AddObserver(vtkCommand::WarningEvent, forwarder);
+ this->Loader->AddObserver(vtkCommand::ErrorEvent, forwarder);

// Check extension
std::vector<char> glbBuffer;
5 changes: 3 additions & 2 deletions tools/workspace/vtk_internal/repository.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ def vtk_internal_repository(
# TODO(jwnimmer-tri) Once there's a tagged release with support for
# VTK_ABI_NAMESPACE, we should switch to an official version number
# here. That probably means waiting for the VTK 10 release.
commit = "4200a02757df119c8c4ca8a66f1e52729522b1f5",
sha256 = "8e2c070127586d5e9d0c3cdd33ca87b08a7dd5b21237922576cb1d1f4d0e7631", # noqa
commit = "02b9b138d3a12cf594e8d393b92a390f762c799f",
sha256 = "aa2061f67119c8cca332a205db560bb59619578fe802d6d29527c2542975ec6a", # noqa
build_file = ":package.BUILD.bazel",
patches = [
# Drake's conventions for VTK patches are:
Expand All @@ -197,6 +197,7 @@ def vtk_internal_repository(
# - Use alphabetical order within a directory when listing patches.
":patches/upstream/common_core_rm_iostream.patch",
":patches/upstream/io_geometry_gltf_default_scene.patch",
":patches/upstream/io_import_errors.patch",
":patches/upstream/rendering_opengl2_scaled_albedo_for_ibl.patch",
":patches/upstream/vtkpugixml_global_ctor.patch",
":patches/common_core_nobacktrace.patch",
Expand Down