Merge topic 'fix/rendering_export'

1c63c7032 export symbols need by vtkh

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2154
This commit is contained in:
Matt Larsen 2020-06-22 19:35:37 +00:00 committed by Kitware Robot
commit 280d3e6909
2 changed files with 6 additions and 4 deletions

@ -16,6 +16,7 @@
#include <vtkm/rendering/raytracing/ChannelBufferOperations.h>
#include <vtkm/rendering/raytracing/Ray.h>
#include <vtkm/rendering/raytracing/Worklets.h>
#include <vtkm/rendering/vtkm_rendering_export.h>
namespace vtkm
{
@ -132,9 +133,9 @@ public:
dispatcher.Invoke(rays.HitIdx, rays.Status);
}
static void MapCanvasToRays(Ray<vtkm::Float32>& rays,
const vtkm::rendering::Camera& camera,
const vtkm::rendering::CanvasRayTracer& canvas);
VTKM_RENDERING_EXPORT static void MapCanvasToRays(Ray<vtkm::Float32>& rays,
const vtkm::rendering::Camera& camera,
const vtkm::rendering::CanvasRayTracer& canvas);
template <typename T>
static vtkm::Id RaysInMesh(Ray<T>& rays)

@ -13,6 +13,7 @@
#include <vtkm/cont/DataSet.h>
#include <vtkm/rendering/raytracing/Ray.h>
#include <vtkm/rendering/vtkm_rendering_export.h>
namespace vtkm
{
@ -21,7 +22,7 @@ namespace rendering
namespace raytracing
{
class VolumeRendererStructured
class VTKM_RENDERING_EXPORT VolumeRendererStructured
{
public:
using DefaultHandle = vtkm::cont::ArrayHandle<vtkm::FloatDefault>;