Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.kitware.com:m-kim/vtk-m into advdatamodel

Browse Source
This commit is contained in:
Mark Kim 2019-06-25 10:36:47 -04:00
commit 699b57191f
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changelog/lodepng.md Normal file
View File

@ -0,0 +1,5 @@
# LodePNG added as a thirdparty
The lodepng library was brought is an thirdparty library.
This has allowed the VTK-m rendering library to have a robust
png decode functionality.

16
vtkm/cont/cuda/internal/DeviceAdapterAlgorithmCuda.h
View File

@ -987,6 +987,11 @@ public:
VTKM_LOG_SCOPE_FUNCTION(vtkm::cont::LogLevel::Perf);
const vtkm::Id inSize = input.GetNumberOfValues();
if (inSize <= 0)
{
output.Shrink(inSize);
return;
}
CopyPortal(input.PrepareForInput(DeviceAdapterTagCuda()),
output.PrepareForOutput(inSize, DeviceAdapterTagCuda()));
}
@ -999,6 +1004,12 @@ public:
VTKM_LOG_SCOPE_FUNCTION(vtkm::cont::LogLevel::Perf);
vtkm::Id size = stencil.GetNumberOfValues();
if (size <= 0)
{
output.Shrink(size);
return;
}
vtkm::Id newSize = CopyIfPortal(input.PrepareForInput(DeviceAdapterTagCuda()),
stencil.PrepareForInput(DeviceAdapterTagCuda()),
output.PrepareForOutput(size, DeviceAdapterTagCuda()),
@ -1015,6 +1026,11 @@ public:
VTKM_LOG_SCOPE_FUNCTION(vtkm::cont::LogLevel::Perf);
vtkm::Id size = stencil.GetNumberOfValues();
if (size <= 0)
{
output.Shrink(size);
return;
}
vtkm::Id newSize = CopyIfPortal(input.PrepareForInput(DeviceAdapterTagCuda()),
stencil.PrepareForInput(DeviceAdapterTagCuda()),
output.PrepareForOutput(size, DeviceAdapterTagCuda()),