Skip to content

Commit 79f4e12

Browse files
author
Aiden McCormack
committed
[workspace] Upgrade vtk_internal to latest commit
1 parent f2ec461 commit 79f4e12

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

tools/workspace/vtk_internal/gen/vtkRenderingOpenGL2ObjectFactory.cxx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "vtkOpenGLImageMapper.h"
2020
#include "vtkOpenGLImageSliceMapper.h"
2121
#include "vtkOpenGLGlyph3DMapper.h"
22+
#include "vtkOpenGLHyperTreeGridMapper.h"
2223
#include "vtkOpenGLLight.h"
2324
#include "vtkOpenGLPointGaussianMapper.h"
2425
#include "vtkOpenGLPolyDataMapper.h"
@@ -33,8 +34,7 @@
3334
#include "vtkOpenGLTextActor3D.h"
3435
#include "vtkOpenGLTextMapper.h"
3536
#include "vtkOpenGLTexture.h"
36-
// Removed the next lines for Drake.
37-
// #include "vtkCocoaRenderWindow.h"
37+
// Removed the next line for Drake.
3838
// #include "vtkOpenGLRenderWindow.h"
3939

4040

@@ -53,6 +53,7 @@ VTK_CREATE_CREATE_FUNCTION(vtkOpenGLHardwareSelector)
5353
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLImageMapper)
5454
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLImageSliceMapper)
5555
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLGlyph3DMapper)
56+
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLHyperTreeGridMapper)
5657
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLLight)
5758
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLPointGaussianMapper)
5859
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLPolyDataMapper)
@@ -67,10 +68,10 @@ VTK_CREATE_CREATE_FUNCTION(vtkOpenGLTextActor)
6768
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLTextActor3D)
6869
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLTextMapper)
6970
VTK_CREATE_CREATE_FUNCTION(vtkOpenGLTexture)
70-
// Removed the next lines for Drake.
71-
// VTK_CREATE_CREATE_FUNCTION(vtkCocoaRenderWindow)
71+
// Removed the next line for Drake.
7272
// VTK_CREATE_CREATE_FUNCTION(vtkOpenGLRenderWindow)
7373

74+
7475
vtkRenderingOpenGL2ObjectFactory::vtkRenderingOpenGL2ObjectFactory()
7576
{
7677
this->RegisterOverride("vtkGPUInfoList", "vtkDummyGPUInfoList", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkDummyGPUInfoList);
@@ -83,6 +84,7 @@ this->RegisterOverride("vtkHardwareSelector", "vtkOpenGLHardwareSelector", "Over
8384
this->RegisterOverride("vtkImageMapper", "vtkOpenGLImageMapper", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLImageMapper);
8485
this->RegisterOverride("vtkImageSliceMapper", "vtkOpenGLImageSliceMapper", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLImageSliceMapper);
8586
this->RegisterOverride("vtkGlyph3DMapper", "vtkOpenGLGlyph3DMapper", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLGlyph3DMapper);
87+
this->RegisterOverride("vtkHyperTreeGridMapper", "vtkOpenGLHyperTreeGridMapper", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLHyperTreeGridMapper);
8688
this->RegisterOverride("vtkLight", "vtkOpenGLLight", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLLight);
8789
this->RegisterOverride("vtkPointGaussianMapper", "vtkOpenGLPointGaussianMapper", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLPointGaussianMapper);
8890
this->RegisterOverride("vtkPolyDataMapper", "vtkOpenGLPolyDataMapper", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLPolyDataMapper);
@@ -98,12 +100,11 @@ this->RegisterOverride("vtkTextActor3D", "vtkOpenGLTextActor3D", "Override for V
98100
this->RegisterOverride("vtkTextMapper", "vtkOpenGLTextMapper", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLTextMapper);
99101
this->RegisterOverride("vtkTexture", "vtkOpenGLTexture", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLTexture);
100102
// Removed the next line for Drake.
101-
// this->RegisterOverride("vtkRenderWindow", "vtkCocoaRenderWindow", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkCocoaRenderWindow);
102103
// this->RegisterOverride("vtkRenderWindow", "vtkOpenGLRenderWindow", "Override for VTK::RenderingOpenGL2 module", 1, vtkObjectFactoryCreatevtkOpenGLRenderWindow);
103104

104105
}
105106

106-
const char * vtkRenderingOpenGL2ObjectFactory::GetVTKSourceVersion()
107+
const char * vtkRenderingOpenGL2ObjectFactory::GetVTKSourceVersion() VTK_FUTURE_CONST
107108
{
108109
return VTK_SOURCE_VERSION;
109110
}

tools/workspace/vtk_internal/gen/vtkRenderingOpenGL2ObjectFactory.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ class VTKRENDERINGOPENGL2_EXPORT vtkRenderingOpenGL2ObjectFactory : public vtkOb
1515
static vtkRenderingOpenGL2ObjectFactory * New();
1616
vtkTypeMacro(vtkRenderingOpenGL2ObjectFactory, vtkObjectFactory);
1717

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

20-
const char * GetVTKSourceVersion() override;
20+
const char * GetVTKSourceVersion() VTK_FUTURE_CONST override;
2121

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

tools/workspace/vtk_internal/repository.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ def vtk_internal_repository(
184184
# TODO(jwnimmer-tri) Once there's a tagged release with support for
185185
# VTK_ABI_NAMESPACE, we should switch to an official version number
186186
# here. That probably means waiting for the VTK 10 release.
187-
commit = "d236d27dde52f1f14eb919adacf0d355af6a440a",
188-
sha256 = "349aa9da6b2be0b21d522695af116219c0fd43fe62902508f21eb59251303185", # noqa
187+
commit = "4200a02757df119c8c4ca8a66f1e52729522b1f5",
188+
sha256 = "8e2c070127586d5e9d0c3cdd33ca87b08a7dd5b21237922576cb1d1f4d0e7631", # noqa
189189
build_file = ":package.BUILD.bazel",
190190
patches = [
191191
# Drake's conventions for VTK patches are:

0 commit comments

Comments
 (0)