Skip to content
Snippets Groups Projects
Commit 2d4565f2 authored by Jaswant Panchumarti (Kitware)'s avatar Jaswant Panchumarti (Kitware)
Browse files

clean up VTK_MARSHAL macro usage

- the webgpu classes should not use them because Marshalling
  is currently not enabled for the VTK::RenderingWebGPU module.
parent 59320947
No related branches found
No related tags found
No related merge requests found
......@@ -22,6 +22,7 @@
#include "vtkInteractionWidgetsModule.h" // For export macro
#include "vtkNew.h"
#include "vtkWidgetRepresentation.h"
#include "vtkWrappingHints.h" // For VTK_MARSHALAUTO
VTK_ABI_NAMESPACE_BEGIN
......
......@@ -7,9 +7,8 @@
#include "vtkBoundedWidgetRepresentation.h"
#include "vtkEllipseArcSource.h"
#include "vtkInteractionWidgetsModule.h" // For export macro
#include "vtkSetGet.h"
#include "vtkVector.h" // For vtkVector3d
#include "vtkWrappingHints.h" // For VTK_MARSHALAUTO
#include "vtkVector.h" // For vtkVector3d
#include "vtkWrappingHints.h" // For VTK_MARSHALAUTO
VTK_ABI_NAMESPACE_BEGIN
class vtkActor;
......
......@@ -12,13 +12,12 @@
#include "vtkGlyph3DMapper.h"
#include "vtkRenderingWebGPUModule.h" // for export macro
#include "vtkWrappingHints.h" // for VTK_MARSHALAUT
#include <memory> // for unique_ptr
VTK_ABI_NAMESPACE_BEGIN
class VTKRENDERINGWEBGPU_EXPORT VTK_MARSHALAUTO vtkWebGPUGlyph3DMapper : public vtkGlyph3DMapper
class VTKRENDERINGWEBGPU_EXPORT vtkWebGPUGlyph3DMapper : public vtkGlyph3DMapper
{
public:
static vtkWebGPUGlyph3DMapper* New();
......
......@@ -17,7 +17,6 @@
#include "vtkPolyDataMapper2D.h"
#include "vtkRenderingWebGPUModule.h" // For export macro
#include "vtkWrappingHints.h" // For VTK_MARSHALAUTO
#include <memory> // for unique_ptr
......@@ -26,8 +25,7 @@ class vtkActor2D;
class vtkPoints;
class vtkWebGPUPolyDataMapper2DInternals;
class VTKRENDERINGWEBGPU_EXPORT VTK_MARSHALAUTO vtkWebGPUPolyDataMapper2D
: public vtkPolyDataMapper2D
class VTKRENDERINGWEBGPU_EXPORT vtkWebGPUPolyDataMapper2D : public vtkPolyDataMapper2D
{
public:
vtkTypeMacro(vtkWebGPUPolyDataMapper2D, vtkPolyDataMapper2D);
......
......@@ -115,6 +115,7 @@ Interaction/Widgets/vtkBiDimensionalRepresentation.h
Interaction/Widgets/vtkBiDimensionalWidget.h
Interaction/Widgets/vtkBorderRepresentation.h
Interaction/Widgets/vtkBorderWidget.h
Interaction/Widgets/vtkBoundedWidgetRepresentation.h
Interaction/Widgets/vtkBoxRepresentation.h
Interaction/Widgets/vtkBoxWidget2.h
Interaction/Widgets/vtkButtonRepresentation.h
......@@ -154,6 +155,8 @@ Interaction/Widgets/vtkImplicitConeRepresentation.h
Interaction/Widgets/vtkImplicitConeWidget.h
Interaction/Widgets/vtkImplicitCylinderRepresentation.h
Interaction/Widgets/vtkImplicitCylinderWidget.h
Interaction/Widgets/vtkImplicitFrustumRepresentation.h
Interaction/Widgets/vtkImplicitFrustumWidget.h
Interaction/Widgets/vtkImplicitPlaneRepresentation.h
Interaction/Widgets/vtkImplicitPlaneWidget2.h
Interaction/Widgets/vtkLightRepresentation.h
......
......@@ -236,6 +236,7 @@ Common/DataModel/vtkCellGridRangeQuery.h
Common/DataModel/vtkCellGridResponder.h
Common/DataModel/vtkCellGridResponderBase.h
Common/DataModel/vtkCellGridResponders.h
Common/DataModel/vtkCellGridSidesCache.h
Common/DataModel/vtkCellGridSidesQuery.h
Common/DataModel/vtkCellIterator.h
Common/DataModel/vtkCellLinks.h
......@@ -277,6 +278,7 @@ Common/DataModel/vtkEmptyCell.h
Common/DataModel/vtkExplicitStructuredGrid.h
Common/DataModel/vtkExtractStructuredGridHelper.h
Common/DataModel/vtkFindCellStrategy.h
Common/DataModel/vtkFrustum.h
Common/DataModel/vtkGenericAdaptorCell.h
Common/DataModel/vtkGenericAttribute.h
Common/DataModel/vtkGenericAttributeCollection.h
......@@ -694,6 +696,7 @@ Rendering/Core/vtkInteractorEventRecorder.h
Rendering/Core/vtkInteractorStyle3D.h
Rendering/Core/vtkLODProp3D.h
Rendering/Core/vtkLabeledContourMapper.h
Rendering/Core/vtkLabeledDatatypeDefinitions.h
Rendering/Core/vtkLightActor.h
Rendering/Core/vtkLightKit.h
Rendering/Core/vtkLogLookupTable.h
......@@ -763,8 +766,6 @@ Rendering/Label/vtkLabelSizeCalculator.h
Rendering/Label/vtkPointSetToLabelHierarchy.h
Rendering/OpenGL2/vtkArrayRenderer.h
Rendering/OpenGL2/vtkCocoaGLView.h
Rendering/OpenGL2/vtkCompositeMapperHelper2.h
Rendering/OpenGL2/vtkCompositePolyDataMapper2.h
Rendering/OpenGL2/vtkDataTransferHelper.h
Rendering/OpenGL2/vtkDrawTexturedElements.h
Rendering/OpenGL2/vtkDummyGPUInfoList.h
......@@ -831,7 +832,6 @@ Rendering/OpenGL2/vtkWin32OpenGLDXRenderWindow.h
Rendering/UI/vtkAndroidRenderWindowInteractor.h
Rendering/UI/vtkCocoaMacOSXSDKCompatibility.h
Rendering/UI/vtkIOSRenderWindowInteractor.h
Rendering/UI/vtkSDL2RenderWindowInteractor.h
Rendering/Volume/vtkAnariVolumeInterface.h
Rendering/Volume/vtkBlockSortHelper.h
Rendering/Volume/vtkDirectionEncoder.h
......@@ -871,6 +871,7 @@ Rendering/VolumeOpenGL2/vtkMultiBlockUnstructuredGridVolumeMapper.h
Rendering/VolumeOpenGL2/vtkMultiBlockVolumeMapper.h
Rendering/VolumeOpenGL2/vtkOpenGLProjectedTetrahedraMapper.h
Rendering/VolumeOpenGL2/vtkOpenGLRayCastImageDisplayHelper.h
Rendering/VolumeOpenGL2/vtkOpenGLSurfaceProbeVolumeMapper.h
Rendering/VolumeOpenGL2/vtkOpenGLVolumeGradientOpacityTable.h
Rendering/VolumeOpenGL2/vtkOpenGLVolumeLookupTable.h
Rendering/VolumeOpenGL2/vtkOpenGLVolumeLookupTables.h
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment