[workspace] Upgrade vtk_internal to latest commit (RobotLocomotion#21387

) Co-authored-by: Jeremy Nimmer <[email protected]>
kotval · May 9, 2024 · 76e0722 · 76e0722
1 parent de0ee27
commit 76e0722
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/tools/workspace/vtk_internal/patches/mr11117.patch b/tools/workspace/vtk_internal/patches/mr11117.patch
@@ -0,0 +1,29 @@
+[vtk_internal] Derive vtkGLTFTexture from vtkObject
+
+https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11117
+
+--- IO/Geometry/vtkGLTFTexture.h
++++ IO/Geometry/vtkGLTFTexture.h
+@@ -6,18 +6,18 @@
+
+ #include "GLTFSampler.h"         // For Sampler
+ #include "vtkIOGeometryModule.h" // For export macro
+-#include "vtkObjectBase.h"
+-#include "vtkSetGet.h"       // For vtkBaseTypeMacro
++#include "vtkObject.h"
++#include "vtkSetGet.h"       // For vtkTypeMacro
+ #include "vtkSmartPointer.h" // For vtkSmartPointer
+
+ VTK_ABI_NAMESPACE_BEGIN
+ class vtkImageData;
+ class vtkTexture;
+
+-class VTKIOGEOMETRY_EXPORT vtkGLTFTexture : public vtkObjectBase
++class VTKIOGEOMETRY_EXPORT vtkGLTFTexture : public vtkObject
+ {
+ public:
+-  vtkBaseTypeMacro(vtkGLTFTexture, vtkObjectBase);
++  vtkTypeMacro(vtkGLTFTexture, vtkObject);
+   static vtkGLTFTexture* New();
+   void PrintSelf(ostream& os, vtkIndent indent) override;
+   vtkSmartPointer<vtkImageData> Image;
diff --git a/tools/workspace/vtk_internal/repository.bzl b/tools/workspace/vtk_internal/repository.bzl
@@ -172,8 +172,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 = "88b2e71c34dc1f321166d36d900f083f9806cd1d",
-        sha256 = "9bbbd4d71e62eb08a5500d2db355d185707ef0725899625656b6e770cd760da5",  # noqa
+        commit = "3192cd9d911624044554247b664a824fa6b06a15",
+        sha256 = "1a524ad8c0ea501267c0fcb934c1ca9141a7bb9f2e7a21ac0e6754786b61743a",  # noqa
         build_file = ":package.BUILD.bazel",
         patches = [
             ":patches/camera_copy.patch",
@@ -183,6 +183,7 @@ def vtk_internal_repository(
             ":patches/gltf_parser.patch",
             ":patches/gltf_quiet_image_errors.patch",
             ":patches/io_image_formats.patch",
+            ":patches/mr11117.patch",
             ":patches/rendering_opengl2_nobacktrace.patch",
             ":patches/vtkdoubleconversion_hidden.patch",
             ":patches/vtkfast_float_hidden.patch",

diff --git a/tools/workspace/vtk_internal/settings.bzl b/tools/workspace/vtk_internal/settings.bzl
@@ -100,7 +100,7 @@ MODULE_SETTINGS = {
             # use generate_common_core_sources() from rules.bzl to handle it.
             "Common/Core/vtkArrayDispatchArrayList.h.in",
             "Common/Core/vtkTypeListMacros.h.in",
-            "Common/Core/vtkTypedArray.h.in",
+            "Common/Core/vtk*TypedArray.h.in",
         ],
         "hdrs_extra": [
             # These are the hdrs outputs of generate_common_core_sources() from
@@ -371,6 +371,7 @@ MODULE_SETTINGS = {
             "IO/Geometry/vtkGLTFDocumentLoader.cxx",
             "IO/Geometry/vtkGLTFDocumentLoaderInternals.cxx",
             "IO/Geometry/vtkGLTFReader.cxx",
+            "IO/Geometry/vtkGLTFTexture.cxx",
             "IO/Geometry/vtkGLTFUtils.cxx",
             "IO/Geometry/vtkGLTFWriter.cxx",
             "IO/Geometry/vtkGLTFWriterUtils.cxx",