Commit 1b475a32 authored by whitlocb's avatar whitlocb

I could not get around build problems related to rendering_visit_vtk depending

on avtPlotter on my cmake branch due avt::glew::initialize. I'm not using 
-unresolved,dynamic_lookup for gcc which lets the linker skip unresolved 
symbols. I find this is a good test for measuring compatibility with Windows, 
which is our most strict platform. CMake dependencies will need to remain strict
to ensure that the code continues to build on Windows.

The problem is where to put avt::glew::initialize. Since it relies on
state from avtCallbacks, it makes sense to keep it in avt. This is why I did
not move avt::glew::initialize into rendering_visit_vtk. Anyway, I decided to
move rendering_visit_vtk and parallel_visit_vtk into the avtPlotter library 
itself so the vtkMappers can use avt::glew::initialize without introducing bad
library dependencies. Plot plugins also use avt::glew::initialize but, as plots,
they already have avtPlotter dependencies so it's okay. Moving 
parallel_visit_vtk also helps with a library dependency problem for parallel.
If I remember correctly, it had a dependence on avtPipeline. Coupled with
Makefile LIBS= updates we can now build in parallel without the 
-unresolved,dynamic_lookup options on the Mac.

While I was at it, I removed the engine/parstate library, moving MPIXfer into
the engine. The other part of engine/parstate was deprecated in 1.12.0 so the
library did not have much reason to exist.

Not much is different from a Linux point of view other than we have 3 fewer
libraries now.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@8845 18c085ea-50e0-402c-830e-de6fd14e8384
parent a24432eb
......@@ -67,8 +67,8 @@ SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libavtddf
LIBS_FOR_MACOSX_PREBINDING=$(ZLIB_LIB) $(GLEW_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS)
##
## Standard targets...
......
......@@ -183,11 +183,11 @@ SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libdatabase
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS)
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lplugin -lexpr -lparser -lutility -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk $(LIBS_FOR_MACOSX_PREBINDING)
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lplugin -lexpr -lparser -lutility -lvisit_vtk -llightweight_visit_vtk -lvisit_verdict $(LIBS_FOR_MACOSX_PREBINDING)
NON_DBIO_SERLIBS=-lmir_ser
NON_DBIO_PARLIBS=-lmir_par
SERLIBS=$(COMMONLIBS) @NON_DBIO_SERLIBS@ -lpipeline_ser -lavtmath_ser $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) @NON_DBIO_PARLIBS@ -lpipeline_par -lavtmath_par $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) @NON_DBIO_PARLIBS@ -lpipeline_par -lavtmath_par $(VTK_LIBS) $(MPI_LIBS)
##
## Standard targets...
......
......@@ -483,9 +483,9 @@ PAROBJ=$(SRC:.C=_par.o)
LIB=libexpressions
SERLIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) -lavtfilters_ser -lavtddf_ser
PARLIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) -lavtfilters_par -lavtddf_par
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lavtview -lvisit_verdict
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser -ldatabase_ser -lmir_ser $(VTK_LIBS) $(SERLIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par -ldatabase_par -lmir_par $(VTK_LIBS) $(PARLIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lvisit_vtk -llightweight_visit_vtk -lavtview -lvisit_verdict
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser -ldatabase_ser -lmir_ser -lavtivp_ser $(VTK_LIBS) $(SERLIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par -ldatabase_par -lmir_par -lavtivp_par $(VTK_LIBS) $(PARLIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@ $(MPI_LIBS)
##
## Standard targets...
......
......@@ -82,10 +82,10 @@ SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libavtwriter
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS)
SER_LIBS_FOR_MACOSX_PREBINDING=-lplotter_ser -lavtfilters_ser -lavtview -lparallel_visit_vtk_ser
PAR_LIBS_FOR_MACOSX_PREBINDING=-lplotter_par -lavtfilters_par -lavtview -lparallel_visit_vtk_par
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(SER_LIBS_FOR_MACOSX_PREBINDING) $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(PAR_LIBS_FOR_MACOSX_PREBINDING) $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
SER_LIBS_FOR_MACOSX_PREBINDING=-lplotter_ser -lavtfilters_ser -lavtview
PAR_LIBS_FOR_MACOSX_PREBINDING=-lplotter_par -lavtfilters_par -lavtview
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(SER_LIBS_FOR_MACOSX_PREBINDING) $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(PAR_LIBS_FOR_MACOSX_PREBINDING) $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
......
......@@ -179,9 +179,9 @@ SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libavtfilters
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS)
COMMONLIBS=-ldbatts -lstate -lcomm -lmisc -lavtexceptions -lexpr -lparser -lutility -lavtview -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk $(LIBS_FOR_MACOSX_PREBINDING)
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par $(VTK_LIBS)
COMMONLIBS=-ldbatts -lstate -lcomm -lmisc -lavtexceptions -lexpr -lparser -lplugin -lutility -lavtview -lvisit_vtk -llightweight_visit_vtk -lvisit_verdict $(LIBS_FOR_MACOSX_PREBINDING)
SERLIBS=$(COMMONLIBS) -lpipeline_ser -ldatabase_ser -lavtivp_ser -lmir_ser -lavtmath_ser $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) -lpipeline_par -ldatabase_par -lavtivp_par -lmir_par -lavtmath_par $(VTK_LIBS) $(MPI_LIBS)
##
## Standard targets...
......
......@@ -58,6 +58,9 @@ SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libavtivp
SERLIBS=-lavtexceptions -lmisc -lavtmath_ser -lvisit_vtk -llightweight_visit_vtk $(VTK_LIBS) $(X_LIBS)
PARLIBS=-lavtexceptions -lmisc -lavtmath_par -lvisit_vtk -llightweight_visit_vtk $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
##
......
......@@ -109,8 +109,8 @@ SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libmir
LIBS_FOR_MACOSX_PREBINDING=$(ZLIB_LIB) $(GLEW_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lstate -lutility -lmisc -lcomm -lexpr -lparser -llightweight_visit_vtk $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lstate -lutility -lmisc -lcomm -lexpr -lparser -llightweight_visit_vtk $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lstate -lutility -lmisc -lcomm -lexpr -lparser -lvisit_verdict -llightweight_visit_vtk $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lstate -lutility -lmisc -lcomm -lexpr -lparser -lvisit_verdict -llightweight_visit_vtk $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING)
##
## Standard targets...
......
......@@ -104,7 +104,7 @@
SUBDIRS_DBIO_ONLY=DBAtts Pipeline Database
SUBDIRS_ENGINE_ONLY=DBAtts Math IVP Pipeline DDF MIR Shapelets\
View Filters Database Expressions Queries Plotter FileWriter \
View Database Filters Expressions Queries Plotter FileWriter \
VisWindow
SUBDIRS_SERVER_COMPONENTS_ONLY=$(SUBDIRS_ENGINE_ONLY)
......
......@@ -38,7 +38,7 @@
#ifndef AVT_COLORTABLES_H
#define AVT_COLORTABLES_H
#include <plotter_exports.h>
#include <pipeline_exports.h>
#include <string>
// Forward declarations
......@@ -73,7 +73,7 @@ class ColorTableAttributes;
//
// ****************************************************************************
class PLOTTER_API avtColorTables
class PIPELINE_API avtColorTables
{
public:
static avtColorTables *Instance();
......
......@@ -42,7 +42,7 @@
#ifndef AVT_LOOKUP_TABLE_H
#define AVT_LOOKUP_TABLE_H
#include <plotter_exports.h>
#include <pipeline_exports.h>
class vtkLookupTable;
......@@ -67,7 +67,7 @@ class vtkSkewLookupTable;
//
// ****************************************************************************
class PLOTTER_API avtLookupTable
class PIPELINE_API avtLookupTable
{
public:
avtLookupTable();
......
......@@ -274,6 +274,7 @@ Data_src= \
Data/avtAverageValueRF.C \
Data/avtCallback.C \
Data/avtCellList.C \
Data/avtColorTables.C \
Data/avtCommonDataFunctions.C \
Data/avtCompositeRF.C \
Data/avtDataAttributes.C \
......@@ -306,6 +307,7 @@ Data_src= \
Data/avtIsolevelsSelection.C \
Data/avtLightingModel.C \
Data/avtLogicalSelection.C \
Data/avtLookupTable.C \
Data/avtMIPRangeRF.C \
Data/avtMaterial.C \
Data/avtMaximumIntensityProjectionRF.C \
......@@ -425,7 +427,7 @@ PAROBJ=$(SRC:.C=_par.o)
LIB=libpipeline
LIBS_FOR_MACOSX_PREBINDING=$(ZLIB_LIB) $(GLEW_LIBS)
SERLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lutility -lexpr -lparser -lavtmath_ser -llightweight_visit_vtk @VTK_LIBS@ $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@
PARLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lutility -lexpr -lparser -lavtmath_par -llightweight_visit_vtk @VTK_LIBS@ $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
PARLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lutility -lexpr -lparser -lavtmath_par -llightweight_visit_vtk @VTK_LIBS@ $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@ $(MPI_LIBS)
##
## Standard targets...
......
......@@ -186,6 +186,10 @@
# Tom Fogal, Sat Jul 18 19:44:48 MDT 2009
# Added GLEW initialization wrapper.
#
# Brad Whitlock, Tue Nov 3 16:33:54 PST 2009
# I moved the code from visit_vtk/rendering to here to avoid introducing
# a dependency on avtPlotter into visit_vtk/rendering.
#
##############################################################################
##
......@@ -197,31 +201,88 @@
##
## Files...
##
OPENGL_SRC=avtOpenGLSurfaceAndWireframeRenderer.C
MESA_SRC=avtMesaSurfaceAndWireframeRenderer.C
OPENGL_SRC=avtOpenGLSurfaceAndWireframeRenderer.C \
vtk/vtkOpenGLRectilinearGridMapper.C \
vtk/vtkOpenGLStructuredGridMapper.C \
vtk/vtkOpenGLTexturedBackgroundMapper.C \
vtk/vtkVisItOpenGLPolyDataMapper.C \
vtk/vtkVisItOpenGLTexture.C
MESA_SRC=avtMesaSurfaceAndWireframeRenderer.C \
vtk/vtkMesaRectilinearGridMapper.C \
vtk/vtkMesaStructuredGridMapper.C \
vtk/vtkMesaTexturedBackgroundMapper.C \
vtk/vtkOSMesaRenderWindow.C \
vtk/vtkVisItMesaPolyDataMapper.C
SRC=avtLegend.C avtVariableLegend.C avtGeometryDrawable.C avtActor.C \
avtBehavior.C avtTheater.C avtMapper.C avtVariableMapper.C avtPlot.C \
avtImageMapper.C avtImageDrawable.C avtLevelsLegend.C \
avtLevelsMapper.C avtDrawer.C avtVectorGlyphMapper.C \
avtUserDefinedMapper.C RenderOrder.C avtVolumeVariableLegend.C \
avtColorTables.C avtSurfaceAndWireframeRenderer.C avtLookupTable.C \
avtLightList.C avtPickActor.C avtCustomRenderer.C \
avtLineoutActor.C avtTransparencyActor.C avtLabelActor.C \
avtDecorationsDrawable.C avtDecorationsMapper.C avtLabeledCurveMapper.C \
avtExternallyRenderedImagesActor.C avtTensorGlyphMapper.C avtDrawable.C \
avtPointGlypher.C avtVariablePointGlyphMapper.C avtSoftwareShader.C \
avtLevelsPointGlyphMapper.C avtCurveLegend.C avtGLEWInitializer.C
RENDERING_SRC=vtk/InitVTKRendering.C \
vtk/vtkBackgroundActor.C \
vtk/vtkDashedXorGridMapper2D.C \
vtk/vtkLineLegend.C \
vtk/vtkMultiFontVectorText.C \
vtk/vtkParallelImageSpaceRedistributor.C \
vtk/vtkRectilinearGridMapper.C \
vtk/vtkRubberBandMapper2D.C \
vtk/vtkStructuredGridMapper.C \
vtk/vtkTexturedBackgroundActor.C \
vtk/vtkTimeSliderActor.C \
vtk/vtkTriad2D.C \
vtk/vtkVectorFontCharacterData.C \
vtk/vtkVisItAxisActor.C \
vtk/vtkVisItAxisActor2D.C \
vtk/vtkVisItCubeAxesActor.C \
vtk/vtkVisItDataSetMapper.C \
vtk/vtkVisItScalarBarActor.C \
vtk/vtkVisItScalarBarWithOpacityActor.C
SRC=RenderOrder.C \
avtActor.C \
avtBehavior.C \
avtCurveLegend.C \
avtCustomRenderer.C \
avtDecorationsDrawable.C \
avtDecorationsMapper.C \
avtDrawable.C \
avtDrawer.C \
avtExternallyRenderedImagesActor.C \
avtGLEWInitializer.C \
avtGeometryDrawable.C \
avtImageDrawable.C \
avtImageMapper.C \
avtLabelActor.C \
avtLabeledCurveMapper.C \
avtLegend.C \
avtLevelsLegend.C \
avtLevelsMapper.C \
avtLevelsPointGlyphMapper.C \
avtLightList.C \
avtLineoutActor.C \
avtMapper.C \
avtPickActor.C \
avtPlot.C \
avtPointGlypher.C \
avtSoftwareShader.C \
avtSurfaceAndWireframeRenderer.C \
avtTensorGlyphMapper.C \
avtTheater.C \
avtTransparencyActor.C \
avtUserDefinedMapper.C \
avtVariableLegend.C \
avtVariableMapper.C \
avtVariablePointGlyphMapper.C \
avtVectorGlyphMapper.C \
avtVolumeVariableLegend.C \
$(RENDERING_SRC)
CPPFLAGS=-I../../include/visit @COMPONENT_CPPFLAGS@ @CPPFLAGS@ $(GLEW_INCLUDE)
CPPFLAGS=-Ivtk -I../../include/visit @COMPONENT_CPPFLAGS@ @CPPFLAGS@ $(GLEW_INCLUDE) \
SEROBJ=$(SRC:.C=.o) $(SEROPENGL_OBJ) @SERMESA_OBJ@
PAROBJ=$(SRC:.C=_par.o) $(PAROPENGL_OBJ) @PARMESA_OBJ@
LIB=libplotter
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(GL_LIBS) $(ZLIB_LIB) $(GLEW_LIBS)
SERLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_ser -lavtview -lavtmath_ser -lavtfilters_ser -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_par -lavtview -lavtmath_par -lavtfilters_par -lavtexceptions -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_par $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
COMMONLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lplugin -lutility -lavtexceptions -lavtview -lvisit_vtk -llightweight_visit_vtk -lvisit_verdict
SERLIBS=$(COMMONLIBS) -lpipeline_ser -ldatabase_ser -lmir_ser -lavtivp_ser -lavtmath_ser -lavtfilters_ser $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS) @OVERLAY_LIB@
PARLIBS=$(COMMONLIBS) -lpipeline_par -ldatabase_par -lmir_par -lavtivp_par -lavtmath_par -lavtfilters_par $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS) $(MPI_LIBS) @OVERLAY_LIB@
##
## Standard targets...
......
......@@ -39,16 +39,17 @@
// ************************************************************************* //
// avtMesaSurfaceAndWireframeRenderer.C //
// ************************************************************************* //
#define VTK_IMPLEMENT_MESA_CXX
#include <avtMesaSurfaceAndWireframeRenderer.h>
#if !defined(_WIN32)
// Do not include mangled Mesa on windows until we figure out what to do.
#include <MangleMesaInclude/gl_mangle.h>
#include "MangleMesaInclude/gl_mangle.h"
#include "MangleMesaInclude/gl.h"
#endif
#define avtOpenGLSurfaceAndWireframeRenderer avtMesaSurfaceAndWireframeRenderer
#define VTK_IMPLEMENT_MESA_CXX
#include "avtOpenGLSurfaceAndWireframeRenderer.C"
......
......@@ -53,6 +53,10 @@
#include <vtkTriangle.h>
#ifndef VTK_IMPLEMENT_MESA_CXX
#include <visit-config.h>
#ifdef HAVE_LIBGLEW
#include <avtGLEWInitializer.h>
#endif
#if defined(__APPLE__) && (defined(VTK_USE_CARBON) || defined(VTK_USE_COCOA))
#include <OpenGL/gl.h>
#else
......@@ -61,8 +65,6 @@
#endif
#include <GL/gl.h>
#endif
#else
#include <GL/gl.h>
#endif
#include <DebugStream.h>
......
......@@ -36,13 +36,8 @@
*
*****************************************************************************/
// ************************************************************************* //
// InitVTK.C //
// ************************************************************************* //
#include <InitVTKRendering.h>
#include <InitVTK.h>
#include <InitVTKNoGraphics.h>
#include <vtkVisItCellDataToPointData.h>
#include <vtkVisItDataSetMapper.h>
#include <vtkVisItOpenGLPolyDataMapper.h>
#include <vtkVisItOpenGLTexture.h>
......@@ -89,7 +84,6 @@ VTK_CREATE_CREATE_FUNCTION(vtkVisItOpenGLTexture);
#ifdef VTK_USE_MANGLED_MESA
VTK_CREATE_CREATE_FUNCTION(vtkVisItMesaPolyDataMapper);
#endif
VTK_CREATE_CREATE_FUNCTION(vtkVisItCellDataToPointData);
VTK_CREATE_CREATE_FUNCTION(vtkVisItDataSetMapper);
VTK_CREATE_CREATE_FUNCTION(vtkVisItRectilinearGrid);
VTK_CREATE_CREATE_FUNCTION(vtkVisItStructuredGrid);
......@@ -148,10 +142,6 @@ vtkVisItGraphicsFactory::vtkVisItGraphicsFactory()
1,
vtkObjectFactoryCreatevtkVisItMesaPolyDataMapper);
#endif
this->RegisterOverride("vtkCellDataToPointData", "vtkVisItCellDataToPointData",
"vtkVisItCellDataToPointData override vtkCellDataToPointData",
1,
vtkObjectFactoryCreatevtkVisItCellDataToPointData);
this->RegisterOverride("vtkDataSetMapper", "vtkVisItDataSetMapper",
"vtkVisItDataSetMapper override vtkDataSetMapper",
1,
......@@ -182,7 +172,7 @@ vtkVisItGraphicsFactory::vtkVisItGraphicsFactory()
}
// ****************************************************************************
// Method: InitVTK::Initialize
// Method: InitVTKRendering::Initialize
//
// Purpose:
// Initialize the VTK portion of the program. Separated from Init so
......@@ -208,10 +198,8 @@ vtkVisItGraphicsFactory::vtkVisItGraphicsFactory()
// ****************************************************************************
void
InitVTK::Initialize(void)
InitVTKRendering::Initialize(void)
{
InitVTKNoGraphics::Initialize();
// Register the factory that allows VisIt objects to override vtk objects.
vtkVisItGraphicsFactory *factory = vtkVisItGraphicsFactory::New();
vtkObjectFactory::RegisterFactory(factory);
......@@ -220,7 +208,7 @@ InitVTK::Initialize(void)
// ****************************************************************************
// Method: InitVTK::Force/Unforce Mesa
// Method: InitVTKRendering::Force/Unforce Mesa
//
// Purpose:
// Forces all VTK rendering objects to be instantiated as Mesa object.
......@@ -240,7 +228,7 @@ InitVTK::Initialize(void)
// ****************************************************************************
void
InitVTK::ForceMesa(void)
InitVTKRendering::ForceMesa(void)
{
#if !defined(_WIN32) && defined(VTK_USE_MANGLED_MESA)
vtkGraphicsFactory::SetUseMesaClasses(1);
......@@ -249,7 +237,7 @@ InitVTK::ForceMesa(void)
}
void
InitVTK::UnforceMesa(void)
InitVTKRendering::UnforceMesa(void)
{
#if !defined(_WIN32) && defined(VTK_USE_MANGLED_MESA)
vtkGraphicsFactory::SetUseMesaClasses(0);
......
......@@ -36,25 +36,30 @@
*
*****************************************************************************/
#ifndef PARALLEL_H
#define PARALLEL_H
#include <mpi.h>
#include <MPIXfer.h>
#include <BufferConnection.h>
#include <QuitRPC.h>
#include <engine_parstate_exports.h>
// ************************************************************************* //
// InitVTKRendering.h //
// ************************************************************************* //
#define INPUT_BUFFER_SIZE 1000
#ifndef INIT_VTK_RENDERING_H
#define INIT_VTK_RENDERING_H
#include <plotter_exports.h>
typedef struct
{
int nbytes;
char buffer[INPUT_BUFFER_SIZE];
} PAR_StateBuffer;
extern MPI_Datatype PAR_STATEBUFFER;
// ****************************************************************************
// Module: InitVTK
//
// Purpose:
// A central point for VTK initialization.
//
// Programmer: Hank Childs
// Creation: April 24, 2001
//
// ****************************************************************************
// Parallel Prototypes
void ENGINE_PARSTATE_API PAR_CreateTypes();
namespace InitVTKRendering
{
PLOTTER_API void Initialize();
PLOTTER_API void ForceMesa();
PLOTTER_API void UnforceMesa();
}
#endif
......@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef __vtkBackgroundActor_h
#define __vtkBackgroundActor_h
#include <rendering_visit_vtk_exports.h>
#include <plotter_exports.h>
#include "vtkActor2D.h"
#include "vtkPolyDataMapper2D.h"
......@@ -61,7 +61,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkActor2D.h"
#include "vtkTimeStamp.h"
class RENDERING_VISIT_VTK_API vtkBackgroundActor : public vtkActor2D
class PLOTTER_API vtkBackgroundActor : public vtkActor2D
{
public:
vtkTypeMacro(vtkBackgroundActor, vtkActor2D);
......
......@@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef __vtkDashedXorGridMapper2D_h
#define __vtkDashedXorGridMapper2D_h
#include <rendering_visit_vtk_exports.h>
#include <plotter_exports.h>
#include "vtkPolyDataMapper2D.h"
......@@ -64,7 +64,7 @@ struct vtkRubberBandMapper2DOverlay;
struct vtkDashedXorGridMapper2DOverlay;
class RENDERING_VISIT_VTK_API vtkDashedXorGridMapper2D : public vtkPolyDataMapper2D
class PLOTTER_API vtkDashedXorGridMapper2D : public vtkPolyDataMapper2D
{
public:
vtkTypeMacro(vtkDashedXorGridMapper2D,vtkPolyDataMapper2D);
......
......@@ -38,7 +38,7 @@
#ifndef __vtkLineLegend_h
#define __vtkLineLegend_h
#include <rendering_visit_vtk_exports.h>
#include <plotter_exports.h>
#include <vtkActor2D.h>
#include <vtkTextMapper.h>
......@@ -49,7 +49,7 @@ class vtkTransform;
class vtkTransformPolyDataFilter;
class RENDERING_VISIT_VTK_API vtkLineLegend : public vtkActor2D
class PLOTTER_API vtkLineLegend : public vtkActor2D
{
public:
vtkTypeMacro(vtkLineLegend,vtkActor2D);
......
......@@ -25,14 +25,14 @@
#define __vtkMesaRectilinearGridMapper_h
#include "vtkRectilinearGridMapper.h"
#include <rendering_visit_vtk_exports.h>
#include <plotter_exports.h>
class vtkProperty;
class vtkRenderWindow;
class vtkMesaRenderer;
class vtkTimerLog;
class RENDERING_VISIT_VTK_API vtkMesaRectilinearGridMapper : public vtkRectilinearGridMapper
class PLOTTER_API vtkMesaRectilinearGridMapper : public vtkRectilinearGridMapper
{
public:
static vtkMesaRectilinearGridMapper *New();
......
......@@ -25,14 +25,14 @@
#define __vtkMesaStructuredGridMapper_h
#include "vtkStructuredGridMapper.h"
#include <rendering_visit_vtk_exports.h>
#include <plotter_exports.h>
class vtkProperty;
class vtkRenderWindow;
class vtkMesaRenderer;
class vtkTimerLog;
class RENDERING_VISIT_VTK_API vtkMesaStructuredGridMapper : public vtkStructuredGridMapper
class PLOTTER_API vtkMesaStructuredGridMapper : public vtkStructuredGridMapper
{
public:
static vtkMesaStructuredGridMapper *New();
......
......@@ -27,13 +27,13 @@
#define __vtkOSMesaRenderWindow_h
#include "vtkMesaRenderWindow.h"
#include <rendering_visit_vtk_exports.h>
#include <plotter_exports.h>
class vtkIdList;
class vtkOSMesaRenderWindowInternal;
class RENDERING_VISIT_VTK_API vtkOSMesaRenderWindow : public vtkMesaRenderWindow
class PLOTTER_API vtkOSMesaRenderWindow : public vtkMesaRenderWindow
{
public:
static vtkOSMesaRenderWindow *New();
......
......@@ -25,13 +25,13 @@
#define __vtkOpenGLRectilinearGridMapper_h
#include "vtkRectilinearGridMapper.h"
#include <rendering_visit_vtk_exports.h>
#include <plotter_exports.h>
class vtkProperty;
class vtkRenderWindow;
class vtkOpenGLRenderer;
class RENDERING_VISIT_VTK_API vtkOpenGLRectilinearGridMapper : public vtkRectilinearGridMapper
class PLOTTER_API vtkOpenGLRectilinearGridMapper : public vtkRectilinearGridMapper
{
public:
static vtkOpenGLRectilinearGridMapper *New();
......
......@@ -25,13 +25,13 @@
#define __vtkOpenGLStructuredGridMapper_h
#include "vtkStructuredGridMapper.h"
#include <rendering_visit_vtk_exports.h>
#include <plotter_exports.h>
class vtkProperty;
class vtkRenderWindow;
class vtkOpenGLRenderer;
class RENDERING_VISIT_VTK_API vtkOpenGLStructuredGridMapper : public vtkStructuredGridMapper
class PLOTTER_API vtkOpenGLStructuredGridMapper : public vtkStructuredGridMapper
{
public:
static vtkOpenGLStructuredGridMapper *New();
......
......@@ -42,7 +42,7 @@
#ifndef __vtkParallelImageSpaceRedistributor_h
#define __vtkParallelImageSpaceRedistributor_h
#include <parallel_visit_vtk_exports.h>
#include <plotter_exports.h>
#include <vtkRenderer.h>
#include <vector>
#include <vtkPolyDataToPolyDataFilter.h>
......@@ -81,7 +81,7 @@
//
// ****************************************************************************
class PARALLEL_VISIT_VTK_API vtkParallelImageSpaceRedistributor :
class PLOTTER_API vtkParallelImageSpaceRedistributor :
public vtkPolyDataToPolyDataFilter
{
public:
......
......@@ -23,12 +23,12 @@
#define __vtkRectilinearGridMapper_h
#include "vtkMapper.h"
#include <rendering_visit_vtk_exports.h>
#include <plotter_exports.h>
class vtkRectilinearGrid;
class vtkRenderer;
class RENDERING_VISIT_VTK_API vtkRectilinearGridMapper : public vtkMapper
class PLOTTER_API vtkRectilinearGridMapper : public vtkMapper