- fixed cuda intersection resource not correctly allocated, leading to a crash when cleaning

- fixed memory leak when textures weren't cleaned up properly due to not being removed from root

Source/OptiX/Private/OptiXContextManager.cpp

@@ -495,7 +495,6 @@ void FOptiXContextManager::InitContext()
 
 	TopObject = NativeContext->createGroup();
 	TopAcceleration = NativeContext->createAcceleration("Trbvh"); // Here the accel structure seems to be actually needed
-	//TopAcceleration->AddToRoot();
 	TopAcceleration->setProperty("refit", "1");
 
 	TopObject->setAcceleration(TopAcceleration);
@@ -746,7 +745,6 @@ void FOptiXContextManager::InitCubemap()
 	NativeContext["skyboxBuffer"]->setBuffer(CubemapsInputBuffer);
 	
 	CubemapSampler = NativeContext->createTextureSampler();
-	//CubemapSampler->AddToRoot();
 	CubemapSampler->setWrapMode(0, RT_WRAP_CLAMP_TO_EDGE);
 	CubemapSampler->setWrapMode(1, RT_WRAP_CLAMP_TO_EDGE);
 	CubemapSampler->setWrapMode(2, RT_WRAP_CLAMP_TO_EDGE);
@@ -886,6 +884,14 @@ void FOptiXContextManager::InitCUDADX()
 		cudaGraphicsD3D11RegisterResource(&CudaResourceColorRight, D3D11TextureColorRight->GetResource(), cudaGraphicsRegisterFlagsNone);
 		PrintLastCudaError("cudaGraphicsD3D11RegisterResource");
 	}
+	// Intersection
+
+	{
+		FD3D11TextureBase* D3D11TextureIntersections = GetD3D11TextureFromRHITexture(LaserIntersectionTexture->Resource->TextureRHI);
+		cudaGraphicsD3D11RegisterResource(&CudaResourceIntersections, D3D11TextureIntersections->GetResource(), cudaGraphicsRegisterFlagsNone);
+		PrintLastCudaError("cudaGraphicsD3D11RegisterResource");
+	}
+
 	// Ortho
 	{
 		FD3D11TextureBase* D3D11TextureOrthoDepth = GetD3D11TextureFromRHITexture(DepthTextureOrtho->Resource->TextureRHI);
@@ -1324,20 +1330,32 @@ void FOptiXContextManager::CleanupCuda()
 
 	if (CudaResourceDepthLeft != NULL)
 		cudaGraphicsUnregisterResource(CudaResourceDepthLeft);
+	PrintLastCudaError("cudaGraphicsUnregisterResource");
+
 	if (CudaResourceDepthRight != NULL)
 		cudaGraphicsUnregisterResource(CudaResourceDepthRight);
+	PrintLastCudaError("cudaGraphicsUnregisterResource");
+
 	if (CudaResourceColorLeft != NULL)
 		cudaGraphicsUnregisterResource(CudaResourceColorLeft);
+	PrintLastCudaError("cudaGraphicsUnregisterResource");
+
 	if (CudaResourceColorRight != NULL)
 		cudaGraphicsUnregisterResource(CudaResourceColorRight);
-	if (CudaResourceIntersections != NULL)
-		cudaGraphicsUnregisterResource(CudaResourceIntersections);
+	PrintLastCudaError("cudaGraphicsUnregisterResource");
+
 	if (CudaResourceDepthOrtho != NULL)
 		cudaGraphicsUnregisterResource(CudaResourceDepthOrtho);
+	PrintLastCudaError("cudaGraphicsUnregisterResource");
+
 	if (CudaResourceColorOrtho != NULL)
 		cudaGraphicsUnregisterResource(CudaResourceColorOrtho);
 	PrintLastCudaError("cudaGraphicsUnregisterResource");
 
+	if (CudaResourceIntersections != NULL)
+		cudaGraphicsUnregisterResource(CudaResourceIntersections);
+	PrintLastCudaError("cudaGraphicsUnregisterResource");
+
 	if (CudaLinearMemoryDepth != NULL)
 		cudaFree(CudaLinearMemoryDepth);
 	if (CudaLinearMemoryColor != NULL)
@@ -1436,6 +1454,9 @@ void FOptiXContextManager::Cleanup_RenderThread()
 {
 	bIsInitializedAll.AtomicSet(false);
 
+	CleanupCuda();
+
+
 	for (auto& Pair : OptiXBuffers)
 	{
 		for (TPair<FString, optix::Buffer>& BufferPair : Pair.Value)
@@ -1512,20 +1533,48 @@ void FOptiXContextManager::Cleanup_RenderThread()
 
 void FOptiXContextManager::Cleanup_GameThread()
 {
-
-	CleanupCuda();
-
 	// Laser stuff
 	IntersectionData.Empty();
 	OldIntersectionData.Empty();
 	LaserIntersectionQueue.Empty();
 	PreviousLaserResults.Empty();
 	
+	LaserIntersectionTexture->RemoveFromRoot();
+	LaserMaterialDynamic->RemoveFromRoot();
+	LaserMaterial->RemoveFromRoot();
+
+	LaserIntersectionTexture->ConditionalBeginDestroy();
+	//LaserMaterialDynamic->ConditionalBeginDestroy();
+	//LaserMaterial->ConditionalBeginDestroy();
+
 	LaserIntersectionTexture.Reset();
 	LaserMaterialDynamic.Reset();
 	LaserMaterial.Reset();
 
 	// Rendering
+
+	OutputTexture->RemoveFromRoot();
+	DepthTexture->RemoveFromRoot();
+	OutputTexture2->RemoveFromRoot();
+	DepthTexture2->RemoveFromRoot();
+	OutputTextureOrtho->RemoveFromRoot();
+	DepthTextureOrtho->RemoveFromRoot();
+	DynamicMaterial->RemoveFromRoot();
+	DynamicMaterialOrtho->RemoveFromRoot();
+	RegularMaterial->RemoveFromRoot();
+	VRMaterial->RemoveFromRoot();
+
+	OutputTexture->ConditionalBeginDestroy();
+	DepthTexture->ConditionalBeginDestroy();
+	OutputTexture2->ConditionalBeginDestroy();
+	DepthTexture2->ConditionalBeginDestroy();
+	OutputTextureOrtho->ConditionalBeginDestroy();
+	DepthTextureOrtho->ConditionalBeginDestroy();
+	//DynamicMaterial->ConditionalBeginDestroy();
+	//DynamicMaterialOrtho->ConditionalBeginDestroy();
+	//RegularMaterial->ConditionalBeginDestroy();
+	//VRMaterial->ConditionalBeginDestroy();
+
 	OutputTexture.Reset();
 	DepthTexture.Reset();
 	OutputTexture2.Reset();