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 topic 'make_ArrayHandle_api_update_for_interop'

Browse Source 
47843ea2e Update vtkm/interop to use non-deprecated make_ArrayHandle API

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2199
This commit is contained in:
Robert Maynard 2020-08-05 17:54:32 +00:00 committed by Kitware Robot
commit e65f0b1123
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/interop/cuda/internal/TransferToOpenGL.h
View File

@ -182,7 +182,7 @@ public:
this->Resource->Map();
ValueType* beginPointer = this->Resource->GetMappedPoiner<ValueType>(size);
auto deviceMemory = vtkm::cont::make_ArrayHandle(beginPointer, size);
auto deviceMemory = vtkm::cont::make_ArrayHandle(beginPointer, size, vtkm::CopyFlag::Off);
//Do a device to device memory copy
vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapterTag>::Copy(handle, deviceMemory);

2
vtkm/interop/internal/TransferToOpenGL.h
View File

@ -66,7 +66,7 @@ public:
T* storage = reinterpret_cast<T*>(this->TempStorage.get());
//construct a handle that is a view onto the memory
return vtkm::cont::make_ArrayHandle(storage, size);
return vtkm::cont::make_ArrayHandle(storage, size, vtkm::CopyFlag::Off);
}
template <typename T>