Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 02:55:47 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity
1053b40bde
vtk-m/vtkm/rendering/CMakeLists.txt

166 lines
4.0 KiB
CMake
Raw Normal View History

adding rendering from other branch
2016-01-20 22:40:54 +00:00
##============================================================================
## Copyright (c) Kitware, Inc.
## All rights reserved.
## See LICENSE.txt for details.
conslidate the license statement
2019-04-15 23:24:21 +00:00
##
adding rendering from other branch
2016-01-20 22:40:54 +00:00
## This software is distributed WITHOUT ANY WARRANTY; without even
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information.
##============================================================================
Allow vtkm_find_gl CMake function to be used no matter vtk-m settings Previously vtkm_find_gl was only usable when rendering was enabled. This is problematic as examples would use vtkm_find_gl even if they didn't use vtkm rendering library.
2018-05-04 18:58:11 +00:00
#unconditionally include rendering contexts so that the helper functions
#are around even if rendering isn't enabled
include(VTKmRenderingContexts)
Extend the CMake rewrite to include vtkm_rendering
2017-10-05 14:28:44 +00:00
if(NOT VTKm_ENABLE_RENDERING)
return()
endif()
Refactor the rendering context flags to not be a combo box. This way in the future it is easier to make currently mutually exclusive compile options be all enabled at the same time.
2017-12-28 21:07:14 +00:00
Extend the CMake rewrite to include vtkm_rendering
2017-10-05 14:28:44 +00:00
adding rendering from other branch
2016-01-20 22:40:54 +00:00
set(headers
Change vtkm::rendering::Window to View The rendering classes do not actually manage windows, and window was not descriptive of what this class was doing. We decided that the class was mostly analogous to what we call a "view" in ParaView.
2016-06-02 21:43:30 +00:00
Actor.h
Modify build to handle non-X-based OpenGL Specifically, I am trying to compile the code on OSX. OSX uses OpenGL libraries in a different directory than most other installs (including X11) and does not generally support GLX. These changes remove the files that support GLX in systems that do not support it. I also added several header files to the CMake lists that were not there but should have been.
2016-05-25 21:32:10 +00:00
AxisAnnotation.h
AxisAnnotation2D.h
AxisAnnotation3D.h
Add new rendering files to CMakeLists.txt This is required for installing the files. It is also useful for developers because it adds the files to IDEs and creates test builds for the header files. Those test builds highlighted some missing includes.
2016-06-01 20:56:30 +00:00
BitmapFont.h
BitmapFontFactory.h
Modify build to handle non-X-based OpenGL Specifically, I am trying to compile the code on OSX. OSX uses OpenGL libraries in a different directory than most other installs (including X11) and does not generally support GLX. These changes remove the files that support GLX in systems that do not support it. I also added several header files to the CMake lists that were not there but should have been.
2016-05-25 21:32:10 +00:00
BoundingBoxAnnotation.h
Change vtkm::rendering::View to Camera
2016-06-02 19:04:01 +00:00
Camera.h
Change vtkm::rendering::RenderSurface to Canvas The word surface is more often used for something like a polygonal mesh, so this name is quite confusing. Canvas is consistent with a conventional name in GUI widget APIs.
2016-06-02 22:02:17 +00:00
Canvas.h
CanvasRayTracer.h
adding rendering from other branch
2016-01-20 22:40:54 +00:00
Color.h
Modify build to handle non-X-based OpenGL Specifically, I am trying to compile the code on OSX. OSX uses OpenGL libraries in a different directory than most other installs (including X11) and does not generally support GLX. These changes remove the files that support GLX in systems that do not support it. I also added several header files to the CMake lists that were not there but should have been.
2016-05-25 21:32:10 +00:00
ColorBarAnnotation.h
Adding color lines, view annotations, line color labels.
2017-07-28 17:31:19 +00:00
ColorLegendAnnotation.h
refactoring ray tracing and adding new renderer
2017-06-17 21:28:45 +00:00
ConnectivityProxy.h
refactoring ray tracing
2018-09-11 02:25:42 +00:00
Cylinderizer.h
Deprecate EncodePNG and DecodePNG from vtkm::rendering.
2020-04-28 15:14:51 +00:00
DecodePNG.h # deprecated
EncodePNG.h # deprecated
Extract canvas's line rendering to `LineRenderer` This allows for the line rendering to be shared for other use cases like `WorldAnnotator`
2017-09-14 16:40:23 +00:00
LineRenderer.h
Batch text and line annotation rendering This commit makes `LineRenderer` and `TextRenderer` to batch line and text rendering. Batching them has shown a significant speedup, especially when usin CUDA.
2021-10-02 21:08:03 +00:00
LineRendererBatcher.h
Add new rendering files to CMakeLists.txt This is required for installing the files. It is also useful for developers because it adds the files to IDEs and creates test builds for the header files. Those test builds highlighted some missing includes.
2016-06-01 20:56:30 +00:00
MatrixHelpers.h
Initial checkin for rendering infrastructure. This largely follows things from EAVL. This is going to change going forward. Most of the stuff is inside Window.h right now for convenience.
2016-02-09 13:59:26 +00:00
Scene.h
Change vtkm::rendering::SceneRenderer* to Mapper* This name was chosen to reflect the analogous name in VTK.
2016-06-02 19:41:14 +00:00
Mapper.h
refactoring ray tracing
2018-09-11 02:25:42 +00:00
MapperCylinder.h
MapperPoint.h
MapperQuad.h
Change vtkm::rendering::SceneRenderer* to Mapper* This name was chosen to reflect the analogous name in VTK.
2016-06-02 19:41:14 +00:00
MapperRayTracer.h
MapperVolume.h
refactoring ray tracing and adding new renderer
2017-06-17 21:28:45 +00:00
MapperConnectivity.h
Refactoring wireframing code
2017-08-16 18:45:28 +00:00
MapperWireframer.h
refactoring ray tracing
2018-09-11 02:25:42 +00:00
Quadralizer.h
let there be scalar things
2020-02-18 03:00:09 +00:00
ScalarRenderer.h
Add new rendering files to CMakeLists.txt This is required for installing the files. It is also useful for developers because it adds the files to IDEs and creates test builds for the header files. Those test builds highlighted some missing includes.
2016-06-01 20:56:30 +00:00
TextAnnotation.h
Add TextAnnotation to rendering library Also made the TextAnnotation classes conform better to VTK-m coding style. Specifically, changed the order of words in subclass names (e.g. TextAnnotationBillboard instead of BillboardTextAnnotation) and broke out each subclass into its own header/source files.
2016-09-01 15:46:37 +00:00
TextAnnotationBillboard.h
TextAnnotationScreen.h
Adds text rendering to `Canvas`.
2017-09-07 16:51:41 +00:00
TextRenderer.h
Batch text and line annotation rendering This commit makes `LineRenderer` and `TextRenderer` to batch line and text rendering. Batching them has shown a significant speedup, especially when usin CUDA.
2021-10-02 21:08:03 +00:00
TextRendererBatcher.h
Fixes warnings
2017-09-18 22:18:33 +00:00
Texture2D.h
adding rendering from other branch
2016-01-20 22:40:54 +00:00
Triangulator.h
Change vtkm::rendering::Window to View The rendering classes do not actually manage windows, and window was not descriptive of what this class was doing. We decided that the class was mostly analogous to what we call a "view" in ParaView.
2016-06-02 21:43:30 +00:00
View.h
Support for 1D rendering.
2016-11-23 15:48:22 +00:00
View1D.h
Add View to rendering library To get rid of some templates, I added the ability to create new instances of mappers and canvases without knowing their type.
2016-09-01 18:33:28 +00:00
View2D.h
View3D.h
Install missing headers found by VTKmCheckSourceInInstall
2019-01-29 19:28:19 +00:00
Wireframer.h
Modify build to handle non-X-based OpenGL Specifically, I am trying to compile the code on OSX. OSX uses OpenGL libraries in a different directory than most other installs (including X11) and does not generally support GLX. These changes remove the files that support GLX in systems that do not support it. I also added several header files to the CMake lists that were not there but should have been.
2016-05-25 21:32:10 +00:00
WorldAnnotator.h
)
Create configuration for rendering library I have noticed at least on my windows machine that source code that uses the rendering package is taking a long time to compile. The rendering library does not rely much on templates and more on virtual methods. Thus, it is a good candidate for moving to a library so that it need be compiled only once. This sets up the configure scripts to create the library. There is also a simple port of one class to the library. More will follow.
2016-08-25 23:54:32 +00:00
set(sources
Compile more sources without device compiler We have been doing a better job at hiding device code (and moving code into libraries). Smoke out source that no longer needs to be compiled by device compilers.
2021-08-12 20:48:39 +00:00
Actor.cxx
AxisAnnotation.cxx
AxisAnnotation2D.cxx
AxisAnnotation3D.cxx
Move BitmapFont code to library
2016-08-26 19:30:52 +00:00
BitmapFont.cxx
BitmapFontFactory.cxx
Compile more sources without device compiler We have been doing a better job at hiding device code (and moving code into libraries). Smoke out source that no longer needs to be compiled by device compilers.
2021-08-12 20:48:39 +00:00
BoundingBoxAnnotation.cxx
Add Camera code to rendering library
2016-08-26 19:52:07 +00:00
Camera.cxx
cleanup. Remove some compiler warnings.
2016-11-23 18:45:03 +00:00
Color.cxx
Compile more sources without device compiler We have been doing a better job at hiding device code (and moving code into libraries). Smoke out source that no longer needs to be compiled by device compilers.
2021-08-12 20:48:39 +00:00
ColorBarAnnotation.cxx
ColorLegendAnnotation.cxx
LineRenderer.cxx
Mapper.cxx
MapperConnectivity.cxx
Scene.cxx
TextAnnotation.cxx
TextAnnotationBillboard.cxx
TextAnnotationScreen.cxx
TextRenderer.cxx
View.cxx
View1D.cxx
View2D.cxx
View3D.cxx
WorldAnnotator.cxx
For VTK-m libs all includes of DeviceAdapterTagCuda happen from cuda files It is very easy to cause ODR violations with DeviceAdapterTagCuda. If you include that header from a C++ file and a CUDA file inside the same program we an ODR violation. The reasons is that the C++ versions will say the tag is invalid, and the CUDA will say the tag is valid. The solution to this is that any compilation unit that includes DeviceAdapterTagCuda from a version of VTK-m that has CUDA enabled must be invoked by the cuda compiler.
2019-04-17 17:59:49 +00:00
raytracing/Logger.cxx
Compile more sources without device compiler We have been doing a better job at hiding device code (and moving code into libraries). Smoke out source that no longer needs to be compiled by device compilers.
2021-08-12 20:48:39 +00:00
raytracing/MeshConnectivityContainers.cxx
raytracing/TriangleExtractor.cxx
For VTK-m libs all includes of DeviceAdapterTagCuda happen from cuda files It is very easy to cause ODR violations with DeviceAdapterTagCuda. If you include that header from a C++ file and a CUDA file inside the same program we an ODR violation. The reasons is that the C++ versions will say the tag is invalid, and the CUDA will say the tag is valid. The solution to this is that any compilation unit that includes DeviceAdapterTagCuda from a version of VTK-m that has CUDA enabled must be invoked by the cuda compiler.
2019-04-17 17:59:49 +00:00
)
# This list of sources has code that uses devices and so might need to be
# compiled with a device-specific compiler (like CUDA).
set(device_sources
Canvas.cxx
CanvasRayTracer.cxx
ConnectivityProxy.cxx
Batch text and line annotation rendering This commit makes `LineRenderer` and `TextRenderer` to batch line and text rendering. Batching them has shown a significant speedup, especially when usin CUDA.
2021-10-02 21:08:03 +00:00
LineRendererBatcher.cxx
refactoring ray tracing
2018-09-11 02:25:42 +00:00
MapperCylinder.cxx
MapperPoint.cxx
MapperQuad.cxx
Move Mappers to rendering library Also changed the mappers to not be templated on the device adapter. Instead, use TryExecute to determine the device adapter at runtime.
2016-08-29 21:50:47 +00:00
MapperRayTracer.cxx
MapperVolume.cxx
For VTK-m libs all includes of DeviceAdapterTagCuda happen from cuda files It is very easy to cause ODR violations with DeviceAdapterTagCuda. If you include that header from a C++ file and a CUDA file inside the same program we an ODR violation. The reasons is that the C++ versions will say the tag is invalid, and the CUDA will say the tag is valid. The solution to this is that any compilation unit that includes DeviceAdapterTagCuda from a version of VTK-m that has CUDA enabled must be invoked by the cuda compiler.
2019-04-17 17:59:49 +00:00
MapperWireframer.cxx
let there be scalar things
2020-02-18 03:00:09 +00:00
ScalarRenderer.cxx
Batch text and line annotation rendering This commit makes `LineRenderer` and `TextRenderer` to batch line and text rendering. Batching them has shown a significant speedup, especially when usin CUDA.
2021-10-02 21:08:03 +00:00
TextRendererBatcher.cxx
For VTK-m libs all includes of DeviceAdapterTagCuda happen from cuda files It is very easy to cause ODR violations with DeviceAdapterTagCuda. If you include that header from a C++ file and a CUDA file inside the same program we an ODR violation. The reasons is that the C++ versions will say the tag is invalid, and the CUDA will say the tag is valid. The solution to this is that any compilation unit that includes DeviceAdapterTagCuda from a version of VTK-m that has CUDA enabled must be invoked by the cuda compiler.
2019-04-17 17:59:49 +00:00
internal/RunTriangulator.cxx
Compile more sources without device compiler We have been doing a better job at hiding device code (and moving code into libraries). Smoke out source that no longer needs to be compiled by device compilers.
2021-08-12 20:48:39 +00:00
For VTK-m libs all includes of DeviceAdapterTagCuda happen from cuda files It is very easy to cause ODR violations with DeviceAdapterTagCuda. If you include that header from a C++ file and a CUDA file inside the same program we an ODR violation. The reasons is that the C++ versions will say the tag is invalid, and the CUDA will say the tag is valid. The solution to this is that any compilation unit that includes DeviceAdapterTagCuda from a version of VTK-m that has CUDA enabled must be invoked by the cuda compiler.
2019-04-17 17:59:49 +00:00
raytracing/BoundingVolumeHierarchy.cxx
raytracing/Camera.cxx
raytracing/ChannelBuffer.cxx
raytracing/ConnectivityTracer.cxx
raytracing/CylinderExtractor.cxx
raytracing/CylinderIntersector.cxx
raytracing/MeshConnectivityBuilder.cxx
raytracing/QuadExtractor.cxx
raytracing/QuadIntersector.cxx
raytracing/RayOperations.cxx
Compile more sources without device compiler We have been doing a better job at hiding device code (and moving code into libraries). Smoke out source that no longer needs to be compiled by device compilers.
2021-08-12 20:48:39 +00:00
raytracing/RayTracer.cxx
add files for a scalar renderer
2020-02-08 04:30:55 +00:00
raytracing/ScalarRenderer.cxx
For VTK-m libs all includes of DeviceAdapterTagCuda happen from cuda files It is very easy to cause ODR violations with DeviceAdapterTagCuda. If you include that header from a C++ file and a CUDA file inside the same program we an ODR violation. The reasons is that the C++ versions will say the tag is invalid, and the CUDA will say the tag is valid. The solution to this is that any compilation unit that includes DeviceAdapterTagCuda from a version of VTK-m that has CUDA enabled must be invoked by the cuda compiler.
2019-04-17 17:59:49 +00:00
raytracing/ShapeIntersector.cxx
raytracing/SphereExtractor.cxx
raytracing/SphereIntersector.cxx
raytracing/TriangleIntersector.cxx
raytracing/VolumeRendererStructured.cxx
Create configuration for rendering library I have noticed at least on my windows machine that source code that uses the rendering package is taking a long time to compile. The rendering library does not rely much on templates and more on virtual methods. Thus, it is a good candidate for moving to a library so that it need be compiled only once. This sets up the configure scripts to create the library. There is also a simple port of one class to the library. More will follow.
2016-08-25 23:54:32 +00:00
)
Extend the CMake rewrite to include vtkm_rendering
2017-10-05 14:28:44 +00:00
# the None backend supports not building the opengl version
Move Canvas classes to rendering library
2016-08-26 21:58:21 +00:00
adding rendering from other branch
2016-01-20 22:40:54 +00:00
#-----------------------------------------------------------------------------
Compile RuntimeDeviceTracker.cxx with CUDA when appropriate The RuntimeDeviceTracker.cxx contains a library method that queries the CUDA device, which only works if compiled as a CUDA source file. This set up will allow code that is not compiled with CUDA use a RuntimeDeviceTracker with other code that does use CUDA.
2017-02-22 23:18:23 +00:00
vtkm_library(
Extend the CMake rewrite to include vtkm_rendering
2017-10-05 14:28:44 +00:00
NAME vtkm_rendering
Compile RuntimeDeviceTracker.cxx with CUDA when appropriate The RuntimeDeviceTracker.cxx contains a library method that queries the CUDA device, which only works if compiled as a CUDA source file. This set up will allow code that is not compiled with CUDA use a RuntimeDeviceTracker with other code that does use CUDA.
2017-02-22 23:18:23 +00:00
SOURCES ${sources}
Extend the CMake rewrite to include vtkm_rendering
2017-10-05 14:28:44 +00:00
HEADERS ${headers}
vtkm_library WRAP_FOR_CUDA renamed to clarify the intent of the property We want the option name to be clear that it might be applicable for more than just CUDA. If VTK-m ever supported something like SYCL it would not be clear that those sources should go in `WRAP_FOR_CUDA`.
2019-07-08 18:09:09 +00:00
DEVICE_SOURCES ${device_sources}
Compile RuntimeDeviceTracker.cxx with CUDA when appropriate The RuntimeDeviceTracker.cxx contains a library method that queries the CUDA device, which only works if compiled as a CUDA source file. This set up will allow code that is not compiled with CUDA use a RuntimeDeviceTracker with other code that does use CUDA.
2017-02-22 23:18:23 +00:00
)
Modify build to handle non-X-based OpenGL Specifically, I am trying to compile the code on OSX. OSX uses OpenGL libraries in a different directory than most other installs (including X11) and does not generally support GLX. These changes remove the files that support GLX in systems that do not support it. I also added several header files to the CMake lists that were not there but should have been.
2016-05-25 21:32:10 +00:00
Extend the CMake rewrite to include vtkm_rendering
2017-10-05 14:28:44 +00:00
#-----------------------------------------------------------------------------
migrate geometry refinement filters
2022-02-12 03:52:43 +00:00
target_link_libraries(vtkm_rendering PUBLIC vtkm_filter_image_processing vtkm_filter_entity_extraction vtkm_io)
Adding private targert link library to fix undefined symbols in ubuntu
2017-07-08 16:14:08 +00:00
if(UNIX AND NOT APPLE)
For VTK-m libs all includes of DeviceAdapterTagCuda happen from cuda files It is very easy to cause ODR violations with DeviceAdapterTagCuda. If you include that header from a C++ file and a CUDA file inside the same program we an ODR violation. The reasons is that the C++ versions will say the tag is invalid, and the CUDA will say the tag is valid. The solution to this is that any compilation unit that includes DeviceAdapterTagCuda from a version of VTK-m that has CUDA enabled must be invoked by the cuda compiler.
2019-04-17 17:59:49 +00:00
target_link_libraries(vtkm_rendering PRIVATE rt)
Adding private targert link library to fix undefined symbols in ubuntu
2017-07-08 16:14:08 +00:00
endif()
Extend the CMake rewrite to include vtkm_rendering
2017-10-05 14:28:44 +00:00
#-----------------------------------------------------------------------------
Refactor the rendering context flags to not be a combo box. This way in the future it is easier to make currently mutually exclusive compile options be all enabled at the same time.
2017-12-28 21:07:14 +00:00
target_link_libraries(vtkm_rendering PUBLIC vtkm_rendering_gl_context)
VTKm_INSTALL_ONLY_LIBRARIES allows installation of only vtk-m libs
2018-01-02 16:06:40 +00:00
if(NOT VTKm_INSTALL_ONLY_LIBRARIES)
Refactor the rendering context flags to not be a combo box. This way in the future it is easier to make currently mutually exclusive compile options be all enabled at the same time.
2017-12-28 21:07:14 +00:00
install(TARGETS vtkm_rendering_gl_context
Extend the CMake rewrite to include vtkm_rendering
2017-10-05 14:28:44 +00:00
EXPORT ${VTKm_EXPORT_NAME}
)
VTKm_INSTALL_ONLY_LIBRARIES allows installation of only vtk-m libs
2018-01-02 16:06:40 +00:00
endif()
Adding private targert link library to fix undefined symbols in ubuntu
2017-07-08 16:14:08 +00:00
Extend the CMake rewrite to include vtkm_rendering
2017-10-05 14:28:44 +00:00
#-----------------------------------------------------------------------------
Revert "Don't build vtkm_rendering if we can't find opengl" There are many rendering classes that do not rely on OpenGL. We really want to be able to use this functionality on systems that do not have OpenGL. That is a big part of the point. This reverts commit c75feb74bb6add43e1be9a42a9bf4bf205b97c39.
2016-11-23 19:14:44 +00:00
add_subdirectory(internal)
add_subdirectory(raytracing)
cmake: avoid adding testing directories if testing is disabled Some testing directories have side effects such as installing headers or compiling code that ultimately doesn't end up getting used.
2021-06-01 22:38:19 +00:00
if (VTKm_ENABLE_TESTING)
add_subdirectory(testing)
endif ()
Reference in New Issue Copy Permalink