Commit 11a711ef authored by Marcus D. Hanwell's avatar Marcus D. Hanwell
Browse files

Moved Hybrid rendering code into its own module

This removes the hard OpenGL dependency from the FiltersHybrid module.

Change-Id: I5bffaa07d2ef69be99ce05b8c8ab31833f34d7d0
parent 1630eee7
......@@ -7,8 +7,6 @@ set(Module_SRCS
vtkFacetReader.cxx
vtkGreedyTerrainDecimation.cxx
vtkGridTransform.cxx
vtkImageDataLIC2D.cxx
vtkImageDataLIC2DExtentTranslator.cxx
vtkImageToPolyDataFilter.cxx
vtkImplicitModeller.cxx
vtkPCAAnalysisFilter.cxx
......@@ -23,33 +21,6 @@ set(Module_SRCS
vtkTemporalSnapToTimeStep.cxx
vtkTransformToGrid.cxx
vtkWeightedTransformFilter.cxx
# FIXME: These should not be in filters.
vtkStructuredGridLIC2D.cxx
vtkStructuredGridLIC2D_fs.cxx
)
set(shader_files
vtkStructuredGridLIC2D_fs.glsl
)
# FIXME: This should be in a rendering module (an OpenGL rendering module)
# for vtkStructuredGridLIC2D
SET( shader_h_files )
FOREACH( file ${shader_files} )
#message("@@@@ file=${file}")
GET_FILENAME_COMPONENT(file_we ${file} NAME_WE)
SET( src ${CMAKE_CURRENT_SOURCE_DIR}/${file} )
SET( res ${CMAKE_CURRENT_BINARY_DIR}/${file_we}.cxx )
SET( resh ${CMAKE_CURRENT_BINARY_DIR}/${file_we}.h )
SET( shader_h_files ${shader_h_files} "${resh}" )
ADD_CUSTOM_COMMAND(
OUTPUT ${res} ${resh}
DEPENDS ${src} vtkEncodeString
COMMAND ${VTK_ENCODESTRING_EXE}
ARGS ${res} ${src} ${file_we} --build-header VTK_HYBRID_EXPORT vtkSystemIncludes.h
)
SET( Kit_EXTRA_SRCS ${Kit_EXTRA_SRCS} ${res} )
set_source_files_properties(${res} WRAP_EXCLUDE)
ENDFOREACH( file )
vtk_module_library(vtkFiltersHybrid ${Module_SRCS})
......@@ -3,11 +3,9 @@ vtk_module(vtkFiltersHybrid
StandAlone
DEPENDS
vtkImagingSources
vtkRenderingOpenGL # This should not be allowed - FIXME - move classes.
vtkFiltersGeneral
COMPILE_DEPENDS
vtkUtilitiesEncodeString # This is only here as GL is in this module. FIXME.
TEST_DEPENDS
vtkRenderingOpenGL
vtkImagingCore
vtkTestingRendering
)
......@@ -218,9 +218,6 @@ set(shader_files
vtkSobelGradientMagnitudePassShader2_fs.glsl
vtkShadowMapPassShader_fs.glsl
vtkShadowMapPassShader_vs.glsl
vtkSurfaceLICPainter_fs1.glsl
vtkSurfaceLICPainter_fs2.glsl
vtkSurfaceLICPainter_vs1.glsl
)
unset(shader_h_files)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment