Commit f5a7a1a8 authored by Ken Martin's avatar Ken Martin

Fix otherPrint and TestEmptyInput tests

There were a lot of abstract classes defined in Rendering/Core or
Rendering/Volume that the OpenGL2 backend has not implemented yet.
This causes a crach whenever such a class is instantiated as is
done by some of the tests. The fix is to either remove or provide
implementations for these classes. For the volme code this patch adds
a VolumeOpenGL2 directory which will be where the new/converted
volume rendering implementations will go.

The other big piece is the painters. As we are not/can not support that API
the classes were moved to OpenGL. The excpetion is the PainterDeviceAdapter
which is part of RenderWindow. When building with OpenGL2 that class is
treated in RenderWindow as a plain vtkObject that does nothing.

vtkSmartVolumeMapper is not currenty built by OpenGL2 but could be if we
are willing to add a bunch of ifdefs. The basic approach is there already
in the class, just need to add a bunch more if we want to have that in the
short term prior to the new GPU mapper being completed.

This patch includes some other fixes that were required to get the tests to
pass. Generally related to missing file properties or extra includes that
were not needed.

Change-Id: Id41db2d90526c109b1acb7442d99d8c2371cc396
parent 5e4c6dd9
......@@ -32,8 +32,6 @@
#include "vtkMath.h"
#include "vtkMutexLock.h"
#include "vtkObjectFactory.h"
#include "vtkPainter.h"
#include "vtkPainterPolyDataMapper.h"
#include "vtkPlane.h"
#include "vtkPlanes.h"
#include "vtkPointData.h"
......
......@@ -13,21 +13,14 @@ set(Module_SRCS
vtkCamera.cxx
vtkCameraInterpolator.cxx
vtkCellCenterDepthSort.cxx
vtkChooserPainter.cxx
vtkClipPlanesPainter.cxx
vtkCoincidentTopologyResolutionPainter.cxx
vtkColorTransferFunction.cxx
vtkCompositeDataDisplayAttributes.cxx
vtkCompositePainter.cxx
vtkCompositePolyDataMapper2.cxx
vtkCompositePolyDataMapper.cxx
vtkCoordinate.cxx
vtkCullerCollection.cxx
vtkCuller.cxx
vtkDataSetMapper.cxx
vtkDefaultPainter.cxx
vtkDiscretizableColorTransferFunction.cxx
vtkDisplayListPainter.cxx
vtkDistanceToCamera.cxx
vtkFollower.cxx
vtkFrustumCoverageCuller.cxx
......@@ -52,9 +45,7 @@ set(Module_SRCS
vtkLightActor.cxx
vtkLightCollection.cxx
vtkLight.cxx
vtkLightingPainter.cxx
vtkLightKit.cxx
vtkLinesPainter.cxx
vtkLogLookupTable.cxx
vtkLookupTableWithEnabling.cxx
vtkMapArrayValues.cxx
......@@ -62,15 +53,8 @@ set(Module_SRCS
vtkMapperCollection.cxx
vtkMapper.cxx
vtkObserverMediator.cxx
vtkPainter.cxx
vtkPainterDeviceAdapter.cxx
vtkPainterPolyDataMapper.cxx
vtkPointsPainter.cxx
vtkPolyDataMapper2D.cxx
vtkPolyDataMapper.cxx
vtkPolyDataPainter.cxx
vtkPolygonsPainter.cxx
vtkPrimitivePainter.cxx
vtkProp3DCollection.cxx
vtkProp3D.cxx
vtkProp3DFollower.cxx
......@@ -86,16 +70,12 @@ set(Module_SRCS
vtkRenderWindowCollection.cxx
vtkRenderWindow.cxx
vtkRenderWindowInteractor.cxx
vtkRepresentationPainter.cxx
vtkScalarsToColorsPainter.cxx
vtkSelectVisiblePoints.cxx
vtkShaderDeviceAdapter2.cxx
vtkStandardPolyDataPainter.cxx
vtkTexture.cxx
vtkTexturedActor2D.cxx
vtkTransformCoordinateSystems.cxx
vtkTransformInterpolator.cxx
vtkTStripsPainter.cxx
vtkTupleInterpolator.cxx
vtkViewDependentErrorMetric.cxx
vtkViewport.cxx
......@@ -117,7 +97,6 @@ set(Module_SRCS
vtkPickingManager.cxx # Needed by vtkRenderWindowInteractor
vtkLODProp3D.cxx # Needed by vtkAreaPicker
vtkWorldPointPicker.cxx # Needed by vtkPropPicker
vtkHardwareSelectionPolyDataPainter.cxx # Needed by vtkPainterPolyDataMapper
# Needed for the InteractorStyleSwitch...
vtkCellPicker.cxx
......@@ -144,6 +123,18 @@ set(Module_SRCS
vtkRenderWidget.cxx
)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set_source_files_properties(
vtkRenderWindow.cxx # dummy out painterdevice adapter
vtkHardwareSelector.cxx # dummy out painter device adapter
PROPERTIES COMPILE_FLAGS -DVTK_OPENGL2)
else() # Add painter device adapter when not OpenGL2
set(Module_SRCS
${Module_SRCS}
vtkPainterDeviceAdapter.cxx
)
endif()
set(${vtk-module}_HDRS
vtkGPUInfoListArray.h
vtkNoise200x200.h
......@@ -162,14 +153,12 @@ set_source_files_properties(
vtkAbstractPicker
vtkAbstractPropPicker
vtkCuller
vtkGPUInfoList.cxx
vtkHardwareSelector
vtkImageMapper3D
vtkInteractorObserver
vtkMapper
vtkMapper2D
vtkPainter
vtkPolyDataPainter
vtkPrimitivePainter
vtkProp
vtkProp3D
vtkRendererDelegate
......
......@@ -20,7 +20,6 @@
#include "vtkIdTypeArray.h"
#include "vtkInformation.h"
#include "vtkObjectFactory.h"
#include "vtkPainterDeviceAdapter.h"
#include "vtkProp.h"
#include "vtkRenderer.h"
#include "vtkRenderWindow.h"
......@@ -35,6 +34,10 @@
#define ID_OFFSET 1
#ifndef VTK_OPENGL2
#include "vtkPainterDeviceAdapter.h"
#endif
//----------------------------------------------------------------------------
namespace
{
......@@ -375,6 +378,7 @@ void vtkHardwareSelector::BeginRenderProp()
//cout << "In BeginRenderProp" << endl;
//glFinish();
#ifndef VTK_OPENGL2
if (this->CurrentPass == ACTOR_PASS)
{
int propid = this->PropID;
......@@ -405,6 +409,7 @@ void vtkHardwareSelector::BeginRenderProp()
renWin->GetPainterDeviceAdapter()->SendAttribute(
vtkDataSetAttributes::SCALARS, 3, VTK_FLOAT, color);
}
#endif
}
//----------------------------------------------------------------------------
......@@ -435,8 +440,10 @@ void vtkHardwareSelector::RenderCompositeIndex(unsigned int index)
return;
}
#ifndef VTK_OPENGL2
index += ID_OFFSET;
//glFinish();
if (this->CurrentPass == COMPOSITE_INDEX_PASS)
{
float color[3];
......@@ -444,6 +451,7 @@ void vtkHardwareSelector::RenderCompositeIndex(unsigned int index)
this->Renderer->GetRenderWindow()->GetPainterDeviceAdapter()->SendAttribute(
vtkDataSetAttributes::SCALARS, 3, VTK_FLOAT, color);
}
#endif
}
//----------------------------------------------------------------------------
......@@ -464,6 +472,7 @@ void vtkHardwareSelector::RenderAttributeId(vtkIdType attribid)
return;
}
#ifndef VTK_OPENGL2
// 0 is reserved.
attribid += ID_OFFSET;
......@@ -480,6 +489,7 @@ void vtkHardwareSelector::RenderAttributeId(vtkIdType attribid)
break;
}
}
#endif
}
//----------------------------------------------------------------------------
......@@ -493,11 +503,13 @@ void vtkHardwareSelector::RenderProcessId(unsigned int processid)
return;
}
#ifndef VTK_OPENGL2
float color[3];
vtkHardwareSelector::Convert(
static_cast<int>(processid + 1), color);
this->Renderer->GetRenderWindow()->GetPainterDeviceAdapter()->SendAttribute(
vtkDataSetAttributes::SCALARS, 3, VTK_FLOAT, color);
#endif
}
}
......
......@@ -19,7 +19,6 @@
#include "vtkCommand.h"
#include "vtkMath.h"
#include "vtkNew.h"
#include "vtkPainterDeviceAdapter.h"
#include "vtkPropCollection.h"
#include "vtkRenderWindowInteractor.h"
#include "vtkRendererCollection.h"
......@@ -30,6 +29,12 @@
#include <cmath>
#ifdef VTK_OPENGL2
class vtkPainterDeviceAdapter : public vtkObject {};
#else
#include "vtkPainterDeviceAdapter.h"
#endif
//----------------------------------------------------------------------------
// Use the vtkAbstractObjectFactoryNewMacro to allow the object factory overrides.
vtkAbstractObjectFactoryNewMacro(vtkRenderWindow)
......
......@@ -29,7 +29,6 @@
#include "vtkMath.h"
#include "vtkMatrix4x4.h"
#include "vtkOutputWindow.h"
#include "vtkPainterPolyDataMapper.h"
#include "vtkPicker.h"
#include "vtkProp3DCollection.h"
#include "vtkPropCollection.h"
......
......@@ -47,20 +47,30 @@ include(vtkObjectFactory)
set(Module_SRCS
vtkCameraPass.cxx
vtkChooserPainter.cxx
vtkClearRGBPass.cxx
vtkClearZPass.cxx
vtkClipPlanesPainter.cxx
vtkCoincidentTopologyResolutionPainter.cxx
vtkColorMaterialHelper.cxx
vtkCompositePainter.cxx
vtkCompositePolyDataMapper2.cxx
vtkDataTransferHelper.cxx
vtkDefaultPainter.cxx
vtkDefaultPass.cxx
vtkDepthPeelingPass.cxx
vtkDisplayListPainter.cxx
vtkFrameBufferObject.cxx
vtkFrameBufferObject2.cxx
vtkGLSLShaderDeviceAdapter2.cxx
vtkGaussianBlurPass.cxx
vtkGenericOpenGLRenderWindow.cxx
vtkHardwareSelectionPolyDataPainter.cxx # Needed by vtkPainterPolyDataMapper
vtkImageProcessingPass.cxx
vtkLightingHelper.cxx
vtkLightingPainter.cxx
vtkLightsPass.cxx
vtkLinesPainter.cxx
vtkOpaquePass.cxx
vtkOpenGLActor.cxx
vtkOpenGLCamera.cxx
......@@ -89,11 +99,19 @@ set(Module_SRCS
vtkOpenGLState.cxx
vtkOpenGLTexture.cxx
vtkOverlayPass.cxx
vtkPainter.cxx
vtkPainterPolyDataMapper.cxx
vtkPixelBufferObject.cxx
vtkPointsPainter.cxx
vtkPolyDataPainter.cxx
vtkPolygonsPainter.cxx
vtkPrimitivePainter.cxx
vtkRenderPass.cxx
vtkRenderPassCollection.cxx
vtkRenderState.cxx
vtkRenderbuffer.cxx
vtkRepresentationPainter.cxx
vtkScalarsToColorsPainter.cxx
vtkSequencePass.cxx
vtkShader2.cxx
vtkShader2Collection.cxx
......@@ -101,6 +119,8 @@ set(Module_SRCS
vtkShadowMapBakerPass.cxx
vtkShadowMapPass.cxx
vtkSobelGradientMagnitudePass.cxx
vtkStandardPolyDataPainter.cxx
vtkTStripsPainter.cxx
vtkTextureObject.cxx
vtkTextureUnitManager.cxx
vtkTranslucentPass.cxx
......@@ -133,6 +153,9 @@ set_source_files_properties(
vtkOpenGLRenderWindow
vtkRenderPass
vtkRenderState
vtkPainter
vtkPolyDataPainter
vtkPrimitivePainter
ABSTRACT
)
......
......@@ -376,4 +376,3 @@ void vtkChooserPainter::PrintSelf(ostream &os, vtkIndent indent)
os << indent << "UseLinesPainterForWireframes: "
<< this->UseLinesPainterForWireframes << endl;
}
......@@ -26,10 +26,10 @@
#ifndef __vtkChooserPainter_h
#define __vtkChooserPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPolyDataPainter.h"
class VTKRENDERINGCORE_EXPORT vtkChooserPainter : public vtkPolyDataPainter
class VTKRENDERINGOPENGL_EXPORT vtkChooserPainter : public vtkPolyDataPainter
{
public:
static vtkChooserPainter *New();
......@@ -118,4 +118,3 @@ private:
};
#endif //_vtkChooserPainter_h
......@@ -18,13 +18,13 @@
#ifndef __vtkClipPlanesPainter_h
#define __vtkClipPlanesPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPainter.h"
class vtkInformationObjectBaseKey;
class vtkPlaneCollection;
class VTKRENDERINGCORE_EXPORT vtkClipPlanesPainter : public vtkPainter
class VTKRENDERINGOPENGL_EXPORT vtkClipPlanesPainter : public vtkPainter
{
public:
static vtkClipPlanesPainter* New();
......
......@@ -23,14 +23,14 @@
#ifndef __vtkCoincidentTopologyResolutionPainter_h
#define __vtkCoincidentTopologyResolutionPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPolyDataPainter.h"
class vtkInformationIntegerKey;
class vtkInformationDoubleKey;
class vtkInformationDoubleVectorKey;
class VTKRENDERINGCORE_EXPORT vtkCoincidentTopologyResolutionPainter :
class VTKRENDERINGOPENGL_EXPORT vtkCoincidentTopologyResolutionPainter :
public vtkPolyDataPainter
{
public:
......@@ -104,4 +104,3 @@ private:
#endif
......@@ -282,4 +282,3 @@ void vtkCompositePainter::PrintSelf(ostream& os, vtkIndent indent)
os << "(none)" << endl;
}
}
......@@ -22,7 +22,7 @@
#ifndef __vtkCompositePainter_h
#define __vtkCompositePainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPainter.h"
#include "vtkColor.h" // needed for vtkColor3d
#include <stack> // needed for RenderBlockState.
......@@ -32,7 +32,7 @@ class vtkInformationObjectBaseKey;
class vtkProperty;
class vtkRenderWindow;
class VTKRENDERINGCORE_EXPORT vtkCompositePainter : public vtkPainter
class VTKRENDERINGOPENGL_EXPORT vtkCompositePainter : public vtkPainter
{
public:
static vtkCompositePainter* New();
......@@ -116,5 +116,3 @@ private:
};
#endif
......@@ -311,4 +311,3 @@ void vtkCompositePolyDataMapper2::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
}
......@@ -22,13 +22,13 @@
#ifndef __vtkCompositePolyDataMapper2_h
#define __vtkCompositePolyDataMapper2_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPainterPolyDataMapper.h"
#include "vtkSmartPointer.h" // for vtkSmartPointer
class vtkCompositeDataDisplayAttributes;
class VTKRENDERINGCORE_EXPORT vtkCompositePolyDataMapper2 : public vtkPainterPolyDataMapper
class VTKRENDERINGOPENGL_EXPORT vtkCompositePolyDataMapper2 : public vtkPainterPolyDataMapper
{
public:
static vtkCompositePolyDataMapper2* New();
......@@ -122,5 +122,3 @@ private:
};
#endif
......@@ -30,7 +30,7 @@
#ifndef __vtkDefaultPainter_h
#define __vtkDefaultPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPainter.h"
class vtkClipPlanesPainter;
......@@ -41,7 +41,7 @@ class vtkLightingPainter;
class vtkRepresentationPainter;
class vtkScalarsToColorsPainter;
class VTKRENDERINGCORE_EXPORT vtkDefaultPainter : public vtkPainter
class VTKRENDERINGOPENGL_EXPORT vtkDefaultPainter : public vtkPainter
{
public:
static vtkDefaultPainter *New();
......@@ -145,4 +145,3 @@ private:
};
#endif //_vtkDefaultPainter_h
......@@ -18,12 +18,12 @@
#ifndef __vtkDisplayListPainter_h
#define __vtkDisplayListPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPainter.h"
class vtkInformationIntegerKey;
class VTKRENDERINGCORE_EXPORT vtkDisplayListPainter : public vtkPainter
class VTKRENDERINGOPENGL_EXPORT vtkDisplayListPainter : public vtkPainter
{
public:
static vtkDisplayListPainter* New();
......
......@@ -23,10 +23,10 @@
#ifndef __vtkHardwareSelectionPolyDataPainter_h
#define __vtkHardwareSelectionPolyDataPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkStandardPolyDataPainter.h"
class VTKRENDERINGCORE_EXPORT vtkHardwareSelectionPolyDataPainter :
class VTKRENDERINGOPENGL_EXPORT vtkHardwareSelectionPolyDataPainter :
public vtkStandardPolyDataPainter
{
public:
......@@ -97,5 +97,3 @@ private:
};
#endif
......@@ -34,4 +34,3 @@ void vtkLightingPainter::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
}
......@@ -18,10 +18,10 @@
#ifndef __vtkLightingPainter_h
#define __vtkLightingPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPolyDataPainter.h"
class VTKRENDERINGCORE_EXPORT vtkLightingPainter : public vtkPolyDataPainter
class VTKRENDERINGOPENGL_EXPORT vtkLightingPainter : public vtkPolyDataPainter
{
public:
static vtkLightingPainter* New();
......
......@@ -25,10 +25,10 @@
#ifndef __vtkLinesPainter_h
#define __vtkLinesPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPrimitivePainter.h"
class VTKRENDERINGCORE_EXPORT vtkLinesPainter : public vtkPrimitivePainter
class VTKRENDERINGOPENGL_EXPORT vtkLinesPainter : public vtkPrimitivePainter
{
public:
static vtkLinesPainter* New();
......@@ -60,4 +60,3 @@ private:
#endif
......@@ -40,7 +40,7 @@
#ifndef __vtkPainter_h
#define __vtkPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkObject.h"
#include "vtkWeakPointer.h" // needed for vtkWeakPointer.
......@@ -55,7 +55,7 @@ class vtkRenderer;
class vtkTimerLog;
class vtkWindow;
class VTKRENDERINGCORE_EXPORT vtkPainter : public vtkObject
class VTKRENDERINGOPENGL_EXPORT vtkPainter : public vtkObject
{
public:
vtkTypeMacro(vtkPainter, vtkObject);
......
......@@ -22,13 +22,13 @@
#ifndef __vtkPainterPolyDataMapper_h
#define __vtkPainterPolyDataMapper_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPolyDataMapper.h"
class vtkPainterPolyDataMapperObserver;
class vtkPainter;
class VTKRENDERINGCORE_EXPORT vtkPainterPolyDataMapper : public vtkPolyDataMapper
class VTKRENDERINGOPENGL_EXPORT vtkPainterPolyDataMapper : public vtkPolyDataMapper
{
public:
static vtkPainterPolyDataMapper* New();
......@@ -135,4 +135,3 @@ private:
};
#endif
......@@ -23,10 +23,10 @@
#ifndef __vtkPointsPainter_h
#define __vtkPointsPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPrimitivePainter.h"
class VTKRENDERINGCORE_EXPORT vtkPointsPainter : public vtkPrimitivePainter
class VTKRENDERINGOPENGL_EXPORT vtkPointsPainter : public vtkPrimitivePainter
{
public:
static vtkPointsPainter* New();
......
......@@ -88,4 +88,3 @@ void vtkPolyDataPainter::PrintSelf(ostream &os, vtkIndent indent)
this->Superclass::PrintSelf(os, indent);
os << indent << "BuildNormals: " << this->BuildNormals << endl;
}
......@@ -41,14 +41,14 @@
#ifndef __vtkPolyDataPainter_h
#define __vtkPolyDataPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPainter.h"
class vtkInformationIntegerKey;
class vtkInformationObjectBaseKey;
class vtkPolyData;
class VTKRENDERINGCORE_EXPORT vtkPolyDataPainter : public vtkPainter
class VTKRENDERINGOPENGL_EXPORT vtkPolyDataPainter : public vtkPainter
{
public:
vtkTypeMacro(vtkPolyDataPainter, vtkPainter);
......
......@@ -20,10 +20,10 @@
#ifndef __vtkPolygonsPainter_h
#define __vtkPolygonsPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPrimitivePainter.h"
class VTKRENDERINGCORE_EXPORT vtkPolygonsPainter : public vtkPrimitivePainter
class VTKRENDERINGOPENGL_EXPORT vtkPolygonsPainter : public vtkPrimitivePainter
{
public:
static vtkPolygonsPainter* New();
......@@ -48,4 +48,3 @@ private:
#endif
......@@ -26,14 +26,14 @@
#ifndef __vtkPrimitivePainter_h
#define __vtkPrimitivePainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPolyDataPainter.h"
class vtkDataArray;
class vtkPoints;
class vtkUnsignedCharArray;
class VTKRENDERINGCORE_EXPORT vtkPrimitivePainter : public vtkPolyDataPainter
class VTKRENDERINGOPENGL_EXPORT vtkPrimitivePainter : public vtkPolyDataPainter
{
public:
vtkTypeMacro(vtkPrimitivePainter, vtkPolyDataPainter);
......
......@@ -21,10 +21,10 @@
#ifndef __vtkRepresentationPainter_h
#define __vtkRepresentationPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPolyDataPainter.h"
class VTKRENDERINGCORE_EXPORT vtkRepresentationPainter : public vtkPolyDataPainter
class VTKRENDERINGOPENGL_EXPORT vtkRepresentationPainter : public vtkPolyDataPainter
{
public:
static vtkRepresentationPainter* New();
......
......@@ -22,7 +22,7 @@
#ifndef __vtkScalarsToColorsPainter_h
#define __vtkScalarsToColorsPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPainter.h"
#include "vtkSmartPointer.h" // needed for vtkSmartPointer.
class vtkDataArray;
......@@ -34,7 +34,7 @@ class vtkInformationStringKey;
class vtkDataSet;
class vtkScalarsToColors;
class VTKRENDERINGCORE_EXPORT vtkScalarsToColorsPainter : public vtkPainter
class VTKRENDERINGOPENGL_EXPORT vtkScalarsToColorsPainter : public vtkPainter
{
public:
static vtkScalarsToColorsPainter* New();
......
......@@ -38,7 +38,7 @@
#ifndef __vtkStandardPolyDataPainter_h
#define __vtkStandardPolyDataPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPolyDataPainter.h"
class vtkCellArray;
......@@ -47,7 +47,7 @@ class vtkPointData;
class vtkPoints;
class vtkShaderDeviceAdapter2;
class VTKRENDERINGCORE_EXPORT vtkStandardPolyDataPainter : public vtkPolyDataPainter
class VTKRENDERINGOPENGL_EXPORT vtkStandardPolyDataPainter : public vtkPolyDataPainter
{
public:
vtkTypeMacro(vtkStandardPolyDataPainter, vtkPolyDataPainter);
......
......@@ -17,10 +17,10 @@
#ifndef __vtkTStripsPainter_h
#define __vtkTStripsPainter_h
#include "vtkRenderingCoreModule.h" // For export macro
#include "vtkRenderingOpenGLModule.h" // For export macro
#include "vtkPrimitivePainter.h"
class VTKRENDERINGCORE_EXPORT vtkTStripsPainter : public vtkPrimitivePainter
class VTKRENDERINGOPENGL_EXPORT vtkTStripsPainter : public vtkPrimitivePainter
{
public:
static vtkTStripsPainter* New();
......@@ -41,7 +41,4 @@ private:
void operator=(const vtkTStripsPainter&); // Not implemented.
};
#endif
......@@ -154,6 +154,12 @@ set(opengl_overrides
Renderer
Texture
)
# Now to see about the GPU info list.
list(APPEND vtk_module_overrides "vtkGPUInfoList")
list(APPEND Module_SRCS "vtkDummyGPUInfoList.cxx")
set(vtk_module_vtkGPUInfoList_override "vtkDummyGPUInfoList")
foreach(_override ${opengl_overrides})
vtk_add_override(vtk${_override} vtkOpenGL${_override})
endforeach()
......
/*=========================================================================
Program: Visualization Toolkit