bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Miguel Pozo 2024-03-11 12:27:39 +01:00
commit a53e8d6d24
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/device/cuda/device_impl.cpp
View File

@ -135,7 +135,9 @@ CUDADevice::CUDADevice(const DeviceInfo &info, Stats &stats, Profiler &profiler)
CUDADevice::~CUDADevice()
{
texture_info.free();
if (cuModule) {
cuda_assert(cuModuleUnload(cuModule));
}
cuda_assert(cuDevicePrimaryCtxRelease(cuDevice));
}

4
intern/cycles/device/hip/device_impl.cpp
View File

@ -126,7 +126,9 @@ HIPDevice::HIPDevice(const DeviceInfo &info, Stats &stats, Profiler &profiler)
HIPDevice::~HIPDevice()
{
texture_info.free();
if (hipModule) {
hip_assert(hipModuleUnload(hipModule));
}
hip_assert(hipCtxDestroy(hipContext));
}

9
source/blender/draw/intern/draw_manager_shader.cc
View File

@ -85,8 +85,6 @@ static void drw_deferred_shader_compilation_exec(void *custom_data,
while (true) {
if (worker_status->stop != 0) {
/* We don't want user to be able to cancel the compilation
* but wm can kill the task if we are closing blender. */
break;
}
@ -151,6 +149,13 @@ static void drw_deferred_shader_compilation_free(void *custom_data)
DRWShaderCompiler *comp = (DRWShaderCompiler *)custom_data;
BLI_spin_lock(&comp->list_lock);
LISTBASE_FOREACH (LinkData *, link, &comp->queue) {
GPU_material_status_set(static_cast<GPUMaterial *>(link->data), GPU_MAT_CREATED);
}
LISTBASE_FOREACH (LinkData *, link, &comp->optimize_queue) {
GPU_material_optimization_status_set(static_cast<GPUMaterial *>(link->data),
GPU_MAT_OPTIMIZATION_READY);
}
BLI_freelistN(&comp->queue);
BLI_freelistN(&comp->optimize_queue);
BLI_spin_unlock(&comp->list_lock);