Skip to content

[workspace] Upgrade vtk_internal to latest commit #22857

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

Merged
merged 1 commit into from
Apr 5, 2025
Merged

[workspace] Upgrade vtk_internal to latest commit #22857

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
11 changes: 6 additions & 5 deletions tools/workspace/vtk_internal/gen/vtkRenderingOpenGL2ObjectFactory.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "vtkOpenGLTextMapper.h"
#include "vtkOpenGLTexture.h"
// Removed the next lines for Drake.
// #include "vtkCocoaRenderWindow.h"
// #include "vtkOpenGLHyperTreeGridMapper.h"
// #include "vtkOpenGLRenderWindow.h"


Expand Down Expand Up @@ -68,9 +68,10 @@ VTK_CREATE_CREATE_FUNCTION(vtkOpenGLTextActor3D)
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLTextMapper)
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLTexture)
// Removed the next lines for Drake.
// VTK_CREATE_CREATE_FUNCTION(vtkCocoaRenderWindow)
// VTK_CREATE_CREATE_FUNCTION(vtkOpenGLHyperTreeGridMapper)
// VTK_CREATE_CREATE_FUNCTION(vtkOpenGLRenderWindow)


vtkRenderingOpenGL2ObjectFactory::vtkRenderingOpenGL2ObjectFactory()
{
this->RegisterOverride("vtkGPUInfoList", "vtkDummyGPUInfoList", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkDummyGPUInfoList);
Expand All @@ -97,13 +98,13 @@ this->RegisterOverride("vtkTextActor", "vtkOpenGLTextActor", "Override for VTK::
this->RegisterOverride("vtkTextActor3D", "vtkOpenGLTextActor3D", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLTextActor3D);
this->RegisterOverride("vtkTextMapper", "vtkOpenGLTextMapper", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLTextMapper);
this->RegisterOverride("vtkTexture", "vtkOpenGLTexture", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLTexture);
// Removed the next line for Drake.
// this->RegisterOverride("vtkRenderWindow", "vtkCocoaRenderWindow", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkCocoaRenderWindow);
// Removed the next lines for Drake.
// this->RegisterOverride("vtkHyperTreeGridMapper", "vtkOpenGLHyperTreeGridMapper", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLHyperTreeGridMapper);
// this->RegisterOverride("vtkRenderWindow", "vtkOpenGLRenderWindow", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLRenderWindow);

}

const char * vtkRenderingOpenGL2ObjectFactory::GetVTKSourceVersion()
const char * vtkRenderingOpenGL2ObjectFactory::GetVTKSourceVersion() VTK_FUTURE_CONST
{
return VTK_SOURCE_VERSION;
}
Expand Down
4 changes: 2 additions & 2 deletions tools/workspace/vtk_internal/gen/vtkRenderingOpenGL2ObjectFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ class VTKRENDERINGOPENGL2_EXPORT vtkRenderingOpenGL2ObjectFactory : public vtkOb
static vtkRenderingOpenGL2ObjectFactory * New();
vtkTypeMacro(vtkRenderingOpenGL2ObjectFactory, vtkObjectFactory);

const char * GetDescription() override { return "vtkRenderingOpenGL2 factory overrides."; }
const char * GetDescription() VTK_FUTURE_CONST override { return "vtkRenderingOpenGL2 factory overrides."; }

const char * GetVTKSourceVersion() override;
const char * GetVTKSourceVersion() VTK_FUTURE_CONST override;

void PrintSelf(ostream &os, vtkIndent indent) override;

Expand Down
4 changes: 2 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 = "d236d27dde52f1f14eb919adacf0d355af6a440a",
sha256 = "349aa9da6b2be0b21d522695af116219c0fd43fe62902508f21eb59251303185", # noqa
commit = "4200a02757df119c8c4ca8a66f1e52729522b1f5",
sha256 = "8e2c070127586d5e9d0c3cdd33ca87b08a7dd5b21237922576cb1d1f4d0e7631", # noqa
build_file = ":package.BUILD.bazel",
patches = [
# Drake's conventions for VTK patches are:
Expand Down