fix_GPU_resource_handling

Change-Id: I4fdb88c0700e5ca73fd6eba087a230c3cbacdba8
jrper · Aug 15, 2014 · 313b647 · 313b647
1 parent c6200b3
commit 313b647
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/Accelerators/Piston/vtkPistonDataWrangling.h b/Accelerators/Piston/vtkPistonDataWrangling.h
@@ -21,7 +21,12 @@
 #ifndef __vtkPistonDataWrangling_h
 #define __vtkPistonDataWrangling_h
 
-#define SPACE thrust::detail::default_device_space_tag
+#include <thrust/version.h>
+#if THRUST_VERSION >= 100600
+# define SPACE thrust::device_space_tag
+#else
+# define SPACE thrust::detail::default_device_space_tag
+#endif
 
 namespace vtkpiston {
 

diff --git a/Accelerators/Piston/vtkPistonMapper.cu b/Accelerators/Piston/vtkPistonMapper.cu
@@ -131,6 +131,17 @@ void CudaRegisterBuffer(struct cudaGraphicsResource **vboResource,
   }
 }
 
+//------------------------------------------------------------------------------
+void CudaUnregisterResource(struct cudaGraphicsResource *vboResource)
+{
+  cudaError_t res = cudaGraphicsUnregisterResource(vboResource);
+  if (res != cudaSuccess)
+  {
+    cerr << "Unregister buffer failed ... " << cudaGetErrorString(res) << endl;
+    return;
+  }
+}
+
 //------------------------------------------------------------------------------
 void CudaTransferToGL(vtkPistonDataObject *id, unsigned long dataObjectMTimeCache,
                       vtkPistonScalarsColors *psc,

diff --git a/Accelerators/Piston/vtkPistonMapper.cxx b/Accelerators/Piston/vtkPistonMapper.cxx
@@ -42,6 +42,7 @@ namespace vtkpiston {
   int QueryVertsPer(vtkPistonDataObject *id);
   void CudaRegisterBuffer(struct cudaGraphicsResource **vboResource,
                           GLuint vboBuffer);
+  void CudaUnregisterResource(struct cudaGraphicsResource* vboResource);
   void CudaTransferToGL(vtkPistonDataObject *id, unsigned long dataObjectMTimeCache,
                         vtkPistonScalarsColors *psc,
                         struct cudaGraphicsResource **vboResources,
@@ -148,6 +149,9 @@ void vtkPistonMapper::PrepareDirectRenderBuffers(int nPoints)
   if (this->Internal->BufferSize != 0)
     {
     // Release old buffer
+    vtkpiston::CudaUnregisterResource(this->Internal->vboResources[0]);
+    vtkpiston::CudaUnregisterResource(this->Internal->vboResources[1]);
+    vtkpiston::CudaUnregisterResource(this->Internal->vboResources[2]);
     vtkgl::DeleteBuffers(3, this->Internal->vboBuffers);
     vtkOpenGLCheckErrorMacro("failed at glDeleteBuffers");
     }