Commit e23c2220 authored by Ben Boeckel's avatar Ben Boeckel

modules: update modules for OpenGL1 removal

parent be28895f
......@@ -11,8 +11,8 @@ vtk_module(vtkAcceleratorsVTKm
TEST_DEPENDS
vtkTestingCore
vtkTestingRendering
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingVolume${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkRenderingVolumeOpenGL2
vtkRenderingFreeType
vtkIOLegacy
vtkIOPLY
......
......@@ -60,9 +60,6 @@ set(VTK_DEFAULT_EGL_DEVICE_INDEX "${default_egl_device_index}" CACHE STRING
mark_as_advanced(VTK_DEFAULT_EGL_DEVICE_INDEX)
# Some sanity checks for use of EGL.
if (VTK_OPENGL_HAS_EGL AND VTK_RENDERING_BACKEND STREQUAL "OpenGL")
message(FATAL_ERROR "You can use VTK_OPENGL_HAS_EGL only for `OpenGL2` rendering backend")
endif()
if (VTK_OPENGL_HAS_EGL AND ANDROID)
message(FATAL_ERROR "You cannot use VTK_OPENGL_HAS_EGL on the ANDROID platform")
endif()
......
......@@ -51,9 +51,7 @@ function(vtk_add_gl2ps_test_cxx)
endif()
# Unit test executable containing PNGCompare test:
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
set(PNGCompareTest vtkRenderingGL2PSCxxTests)
elseif(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(PNGCompareTest vtkRenderingGL2PSOpenGL2CxxTests)
endif()
......@@ -128,9 +126,7 @@ function(vtk_add_pdf_test_cxx)
endif()
# Unit test executable containing PNGCompare test:
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
set(PNGCompareTest vtkRenderingGL2PSCxxTests)
elseif(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(PNGCompareTest vtkRenderingGL2PSOpenGL2CxxTests)
endif()
......
......@@ -37,9 +37,7 @@ function(vtk_add_svg_test)
endif()
# Unit test executable containing PNGCompare test:
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
set(PNGCompareTest vtkRenderingGL2PSCxxTests)
elseif(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(PNGCompareTest vtkRenderingGL2PSOpenGL2CxxTests)
endif()
......
......@@ -5,7 +5,7 @@ vtk_module(vtkChartsCore
vtkTestingCore
vtkTestingRendering
vtkViewsContext2D
vtkRenderingContext${VTK_RENDERING_BACKEND}
vtkRenderingContextOpenGL2
#vtkIOExport
vtkIOInfovis
DEPENDS
......@@ -20,4 +20,4 @@ vtk_module(vtkChartsCore
vtkCommonExecutionModel
vtkCommonTransforms
vtkInfovisCore
)
\ No newline at end of file
)
......@@ -2,7 +2,7 @@ vtk_module(vtkCommonColor
TEST_DEPENDS
vtkIOImage
vtkCommonExecutionModel
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
......@@ -11,4 +11,4 @@ vtk_module(vtkCommonColor
DEPENDS
vtkCommonCore
vtkCommonDataModel
)
\ No newline at end of file
)
......@@ -3,10 +3,10 @@ vtk_module(vtkCommonComputationalGeometry
StandAlone
TEST_DEPENDS
vtkTestingCore
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
KIT
vtkCommon
DEPENDS
vtkCommonCore
vtkCommonDataModel
)
\ No newline at end of file
)
......@@ -78,11 +78,11 @@
//
// @code{.cpp}
// #include "vtkAutoInit.h"
// VTK_MODULE_INIT(vtkRenderingOpenGL);
// VTK_MODULE_INIT(vtkRenderingOpenGL2);
// @endcode
//
// The above snippet if included in the global scope will ensure the object
// factories for vtkRenderingOpenGL are correctly registered and unregistered.
// factories for vtkRenderingOpenGL2 are correctly registered and unregistered.
#define VTK_MODULE_INIT(M) \
VTK_AUTOINIT_DECLARE(M) \
static struct M##_ModuleInit { \
......
......@@ -16,8 +16,8 @@ vtk_module(vtkCommonDataModel
vtkChartsCore
vtkViewsContext2D
vtkRenderingCore
vtkRenderingContext${VTK_RENDERING_BACKEND}
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingContextOpenGL2
vtkRenderingOpenGL2
KIT
vtkCommon
DEPENDS
......
......@@ -3,10 +3,10 @@ vtk_module(vtkCommonTransforms
StandAlone
TEST_DEPENDS
vtkTestingCore
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
KIT
vtkCommon
DEPENDS
vtkCommonCore
vtkCommonMath
)
\ No newline at end of file
)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(extra_opengl_depend vtkDomainsChemistry${VTK_RENDERING_BACKEND})
endif()
vtk_module(vtkDomainsChemistry
GROUPS
StandAlone
......@@ -10,8 +7,8 @@ vtk_module(vtkDomainsChemistry
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
${extra_opengl_depend}
vtkRenderingOpenGL2
vtkDomainsChemistryOpenGL2
DEPENDS
vtkCommonCore
vtkCommonDataModel
......
if(TARGET vtkRenderingOpenGL)
message(FATAL_ERROR "vtkChemistyOpenGL2 cannot be built with vtkRenderingOpenGL, please disable one of them.")
endif()
include(vtkObjectFactory)
set(Module_SRCS
......
......@@ -13,8 +13,7 @@ vtk_module(vtkDomainsChemistryOpenGL2
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
${extra_opengl_depend}
vtkRenderingOpenGL2
DEPENDS
vtkCommonCore
vtkDomainsChemistry
......@@ -25,4 +24,4 @@ vtk_module(vtkDomainsChemistryOpenGL2
vtkCommonMath
vtkRenderingCore
vtkglew
)
\ No newline at end of file
)
......@@ -4,7 +4,7 @@ vtk_module(vtkDomainsMicroscopy
vtkTestingCore
vtkTestingRendering
vtkInteractionImage
vtkRenderingContext${VTK_RENDERING_BACKEND}
vtkRenderingContextOpenGL2
EXCLUDE_FROM_ALL
DEPENDS
vtkIOImage
......@@ -12,4 +12,4 @@ vtk_module(vtkDomainsMicroscopy
vtkCommonCore
vtkCommonDataModel
vtkCommonExecutionModel
)
\ No newline at end of file
)
......@@ -16,7 +16,7 @@ find_package(VTK COMPONENTS
vtkIOLegacy
vtkIOXML
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingCore
)
include(${VTK_USE_FILE})
......
......@@ -10,7 +10,7 @@ vtk_module_config(VTK
vtkFiltersSources
vtkInteractionStyle
vtkRenderingLabel
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
include(${VTK_USE_FILE})
......
......@@ -8,7 +8,7 @@ vtk_module_config(VTK
vtkCommonDataModel
vtkFiltersGeometry
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
include(${VTK_USE_FILE})
......
......@@ -6,7 +6,7 @@ find_package(VTK COMPONENTS
vtkGUISupportQt
vtkIOImage
vtkInteractionImage
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingCore
)
include(${VTK_USE_FILE})
......
......@@ -14,7 +14,7 @@ vtk_module_config(VTK
vtkImagingStatistics
vtkImagingStencil
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkRenderingCore
vtkTestingCore
vtkTestingRendering
......
......@@ -17,7 +17,7 @@ vtk_module_config(VTK
vtkGUISupportQt
vtkIOInfovis
vtkInfovisCore
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkViewsCore
vtkViewsInfovis
vtkViewsQt
......
......@@ -10,7 +10,7 @@ find_package(VTK COMPONENTS
vtkIOXML
vtkImagingStatistics
vtkInteractionStyle
vtkRenderingVolume${VTK_RENDERING_BACKEND}
vtkRenderingVolumeOpenGL2
vtkTestingRendering
vtksys
)
......
......@@ -10,7 +10,7 @@ vtk_module_config(VTK
vtkIOXML
vtkImagingHybrid
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingRendering
)
include(${VTK_USE_FILE})
......
......@@ -10,7 +10,7 @@ vtk_module_config(VTK
vtkFiltersSources
vtkIOXML
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingCore
vtksys
)
......
......@@ -11,7 +11,7 @@ vtk_module_config(VTK
vtkCommonCore
vtkFiltersSources
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
include(${VTK_USE_FILE})
......
......@@ -9,8 +9,8 @@ vtk_module_config(VTK
vtkFiltersSources
vtkFiltersSources
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
include(${VTK_USE_FILE})
add_executable(Cone MACOSX_BUNDLE Cone.cxx)
target_link_libraries(Cone ${VTK_LIBRARIES})
\ No newline at end of file
target_link_libraries(Cone ${VTK_LIBRARIES})
......@@ -8,9 +8,9 @@ vtk_module_config(VTK
vtkFiltersSources
vtkFiltersSources
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
include(${VTK_USE_FILE})
add_executable(Cone2 MACOSX_BUNDLE Cone2.cxx)
target_link_libraries(Cone2 ${VTK_LIBRARIES})
\ No newline at end of file
target_link_libraries(Cone2 ${VTK_LIBRARIES})
......@@ -8,7 +8,7 @@ vtk_module_config(VTK
vtkCommonCore
vtkFiltersSources
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
include(${VTK_USE_FILE})
......
......@@ -8,7 +8,7 @@ vtk_module_config(VTK
vtkCommonCore
vtkFiltersSources
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
include(${VTK_USE_FILE})
......
......@@ -8,7 +8,7 @@ vtk_module_config(VTK
vtkCommonCore
vtkFiltersSources
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
include(${VTK_USE_FILE})
......
......@@ -9,7 +9,7 @@ vtk_module_config(VTK
vtkFiltersSources
vtkInteractionStyle
vtkInteractionWidgets
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
include(${VTK_USE_FILE})
......
......@@ -10,7 +10,7 @@ vtk_module_config(VTK
vtkFiltersModeling
vtkIOXML
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingRendering
)
include(${VTK_USE_FILE})
......
......@@ -8,7 +8,7 @@ vtk_module_config(VTK
vtkIOImage
vtkIOXML
vtkInteractionWidgets
vtkRenderingVolume${VTK_RENDERING_BACKEND}
vtkRenderingVolumeOpenGL2
)
include(${VTK_USE_FILE})
......
......@@ -6,7 +6,7 @@ vtk_module_load(
vtkCommonCore
vtkFiltersSources
vtkInteractionWidgets
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingRendering
)
include(${VTK_USE_FILE})
......
......@@ -9,8 +9,8 @@ vtk_module(vtkFiltersCore
vtkIOExodus
vtkImagingCore
vtkFiltersGeneral
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingVolume${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkRenderingVolumeOpenGL2
KIT
vtkFilters
DEPENDS
......
......@@ -7,7 +7,7 @@ vtk_module(vtkFiltersExtraction
vtkIOLegacy
vtkIOXML
vtkIOExodus
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingRendering
KIT
vtkFilters
......
......@@ -7,7 +7,7 @@ vtk_module(vtkFiltersFlowPaths
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
DEPENDS
vtkCommonCore
vtkCommonDataModel
......
......@@ -9,7 +9,7 @@ vtk_module(vtkFiltersGeneral
vtkIOXML
vtkImagingMath
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkRenderingAnnotation
vtkRenderingLabel
vtkTestingRendering
......@@ -26,4 +26,4 @@ vtk_module(vtkFiltersGeneral
vtkCommonMath
vtkCommonSystem
vtkCommonTransforms
)
\ No newline at end of file
)
......@@ -4,7 +4,7 @@ vtk_module(vtkFiltersGeneric
TEST_DEPENDS
vtkIOXML
vtkIOLegacy
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkFiltersModeling
vtkRenderingLabel
vtkTestingRendering
......@@ -23,4 +23,4 @@ vtk_module(vtkFiltersGeneric
vtkCommonTransforms
vtkFiltersCore
vtkFiltersSources
)
\ No newline at end of file
)
......@@ -3,7 +3,7 @@ vtk_module(vtkFiltersGeometry
StandAlone
TEST_DEPENDS
vtkIOXML
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingRendering
vtkInteractionStyle
KIT
......@@ -14,4 +14,4 @@ vtk_module(vtkFiltersGeometry
vtkCommonExecutionModel
PRIVATE_DEPENDS
vtkFiltersCore
)
\ No newline at end of file
)
......@@ -3,7 +3,7 @@ vtk_module(vtkFiltersHybrid
StandAlone
TEST_DEPENDS
vtkIOXML
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkImagingCore
vtkImagingStencil
vtkTestingRendering
......
......@@ -9,7 +9,7 @@ vtk_module(vtkFiltersHyperTree
vtkRenderingAnnotation
vtkTestingRendering
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
KIT
vtkFilters
DEPENDS
......
......@@ -4,7 +4,7 @@ vtk_module(vtkFiltersModeling
TEST_DEPENDS
vtkCommonColor # For vtkBandedPolyDataContourFilter used in a test
vtkIOXML
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingRendering
vtkInteractionStyle
KIT
......@@ -19,4 +19,4 @@ vtk_module(vtkFiltersModeling
vtkCommonTransforms
vtkFiltersCore
vtkFiltersSources
)
\ No newline at end of file
)
......@@ -10,7 +10,7 @@ vtk_module(vtkFiltersOpenTurns
vtkFiltersCore
TEST_DEPENDS
vtkIOInfovis
vtkRenderingContext${VTK_RENDERING_BACKEND}
vtkRenderingContextOpenGL2
vtkTestingCore
vtkTestingRendering
vtkViewsContext2D
......
......@@ -7,7 +7,7 @@ vtk_module(vtkFiltersParallel
vtkTestingRendering
vtkInteractionStyle
vtkIOXML
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkRenderingParallel
vtkFiltersParallelGeometry
vtkFiltersParallelMPI
......@@ -32,4 +32,4 @@ vtk_module(vtkFiltersParallel
vtkIOLegacy
vtkParallelCore
vtkRenderingCore
)
\ No newline at end of file
)
......@@ -8,7 +8,7 @@ if (NOT WIN32)
TEST_DEPENDS
vtkFiltersParallelMPI
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkRenderingParallel
vtkTestingCore
vtkTestingRendering
......@@ -23,4 +23,4 @@ if (NOT WIN32)
vtkCommonExecutionModel
vtkParallelMPI
)
endif()
\ No newline at end of file
endif()
......@@ -10,9 +10,9 @@ vtk_module(vtkFiltersPoints
vtkFiltersGeneral
vtkViewsContext2D
vtkChartsCore
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingVolume${VTK_RENDERING_BACKEND}
vtkRenderingContext${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkRenderingVolumeOpenGL2
vtkRenderingContextOpenGL2
vtkRenderingContext2D
KIT
vtkFilters
......
......@@ -2,7 +2,7 @@ vtk_module(vtkFiltersProgrammable
GROUPS
StandAlone
TEST_DEPENDS
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingRendering
vtkInteractionStyle
KIT
......@@ -13,4 +13,4 @@ vtk_module(vtkFiltersProgrammable
vtkCommonCore
vtkCommonDataModel
vtkCommonTransforms
)
\ No newline at end of file
)
vtk_module(vtkFiltersReebGraph
TEST_DEPENDS
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingRendering
vtkInteractionStyle
KIT
......@@ -11,4 +11,4 @@ vtk_module(vtkFiltersReebGraph
vtkCommonCore
vtkCommonDataModel
vtkFiltersCore
)
\ No newline at end of file
)
......@@ -5,7 +5,7 @@ vtk_module(vtkFiltersSelection
vtkFiltersExtraction
vtkIOLegacy
vtkIOXML
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkRenderingAnnotation
vtkTestingRendering
vtkInteractionStyle
......@@ -16,4 +16,4 @@ vtk_module(vtkFiltersSelection
vtkCommonExecutionModel
PRIVATE_DEPENDS
vtkCommonDataModel
)
\ No newline at end of file
)
......@@ -5,7 +5,7 @@ vtk_module(vtkFiltersSources
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkFiltersModeling
vtkFiltersVerdict
vtkIOXML
......
......@@ -2,7 +2,7 @@ vtk_module(vtkFiltersTexture
GROUPS
StandAlone
TEST_DEPENDS
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
KIT
vtkFilters
DEPENDS
......@@ -12,4 +12,4 @@ vtk_module(vtkFiltersTexture
vtkCommonDataModel
vtkCommonTransforms
vtkFiltersGeneral
)
\ No newline at end of file
)
......@@ -4,6 +4,6 @@ if(WIN32)
GROUPS
EXCLUDE_FROM_WRAPPING
DEPENDS
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
endif()
\ No newline at end of file
endif()
......@@ -7,7 +7,7 @@ vtk_module(vtkGUISupportQt
EXCLUDE_FROM_WRAPPING
DEPENDS
vtkCommonCore
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkRenderingCore
PRIVATE_DEPENDS
vtkCommonDataModel
......
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
set(_groups GROUPS Qt)
endif()
vtk_module(vtkGUISupportQtOpenGL
${_groups}
TEST_DEPENDS
vtkTestingCore
vtkTestingRendering
......@@ -10,8 +6,8 @@ vtk_module(vtkGUISupportQtOpenGL
EXCLUDE_FROM_WRAPPING
DEPENDS
vtkCommonCore
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
PRIVATE_DEPENDS
vtkGUISupportQt
vtkInteractionStyle
)
\ No newline at end of file
)
......@@ -5,7 +5,7 @@ vtk_module(vtkGeovisCore
vtkViewsGeovis
vtkViewsInfovis
vtkRenderingCore
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingRendering
vtkInteractionStyle
DEPENDS
......@@ -28,4 +28,4 @@ vtk_module(vtkGeovisCore
vtkImagingCore
vtkImagingSources
vtkInfovisLayout
)
\ No newline at end of file
)
......@@ -2,7 +2,7 @@ vtk_module(vtkIOEnSight
GROUPS
StandAlone
TEST_DEPENDS
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
KIT
vtkIO
DEPENDS
......@@ -10,4 +10,4 @@ vtk_module(vtkIOEnSight
PRIVATE_DEPENDS
vtkCommonCore
vtkCommonDataModel
)
\ No newline at end of file
)
......@@ -4,7 +4,7 @@ vtk_module(vtkIOExodus
TEST_DEPENDS
vtkTestingRendering
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
KIT
vtkIO