Merge pull request #2035 from peastman/cudacontext

Fixed CUDA error when working with multiple contexts

Merge pull request #2035 from peastman/cudacontext
Fixed CUDA error when working with multiple contexts
424c06e4 · peastman · GitHub · 8fe2b5a5 · 3e43d52b · 424c06e4
Unverified Commit 424c06e4 authored Apr 04, 2018 by peastman Committed by GitHub Apr 04, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

platforms/cuda/src/CudaArray.cpp platforms/cuda/src/CudaArray.cpp +1 -0

No files found.
--- a/platforms/cuda/src/CudaArray.cpp
+++ b/platforms/cuda/src/CudaArray.cpp
@@ -41,6 +41,7 @@ CudaArray::CudaArray(CudaContext& context, int size, int elementSize, const std:

 CudaArray::~CudaArray() {
    if (pointer != 0 && ownsMemory && context->getContextIsValid()) {
+        context->setAsCurrent();
        CUresult result = cuMemFree(pointer);
        if (result != CUDA_SUCCESS) {
            std::stringstream str;