Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'fix-cuda-interop'

Browse Source 
8d62bf128 Fix cuda-opengl interop

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2528
This commit is contained in:
Sujin Philip 2021-07-13 14:48:08 +00:00 committed by Kitware Robot
commit c5b72c9d97
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ public:
void Map()
{
//map the resource into cuda, so we can copy it
cudaError_t cError = cudaGraphicsMapResources(1, &this->CudaResource);
cudaError_t cError = cudaGraphicsMapResources(1, &this->CudaResource, cudaStreamPerThread);
if (cError != cudaSuccess)
{
throw vtkm::cont::ErrorBadAllocation(
@ -106,7 +106,7 @@ public:
return pointer;
}
void UnMap() { cudaGraphicsUnmapResources(1, &this->CudaResource); }
void UnMap() { cudaGraphicsUnmapResources(1, &this->CudaResource, cudaStreamPerThread); }
private:
bool Registered;
@ -182,7 +182,8 @@ public:
this->Resource->Map();
ValueType* beginPointer = this->Resource->GetMappedPoiner<ValueType>(size);
auto deviceMemory = vtkm::cont::make_ArrayHandle(beginPointer, size, vtkm::CopyFlag::Off);
vtkm::cont::ArrayHandleBasic<ValueType> deviceMemory(
beginPointer, handle.GetNumberOfValues(), DeviceAdapterTag{}, [](void*) {});
//Do a device to device memory copy
vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapterTag>::Copy(handle, deviceMemory);