griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Brecht Van Lommel
2025-06-18 19:28:50 +02:00
parent db9ae93f02 a7f9ad5af6
commit 975322dde5
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/device/cuda/graphics_interop.cpp
View File

@@ -157,7 +157,10 @@ void CUDADeviceGraphicsInterop::free()
cu_external_memory_ = nullptr;
}
cu_external_memory_ptr_ = 0;
if (cu_external_memory_ptr_) {
cuda_device_assert(device_, cuMemFree(cu_external_memory_ptr_));
cu_external_memory_ptr_ = 0;
}
# ifdef _WIN32
if (vulkan_windows_handle_) {

5
intern/cycles/device/hip/graphics_interop.cpp
View File

@@ -105,7 +105,10 @@ void HIPDeviceGraphicsInterop::free()
hip_graphics_resource_ = nullptr;
}
hip_external_memory_ptr_ = 0;
if (hip_external_memory_ptr_) {
hip_device_assert(device_, hipFree(hip_external_memory_ptr_));
hip_external_memory_ptr_ = 0;
}
buffer_size_ = 0;