diff options
| author | Sergey Sharybin <sergey@blender.org> | 2021-11-22 19:32:23 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2021-11-22 19:32:23 +0300 |
| commit | 1706bf7780a04a5affa016339a1fdb2563e97cb0 (patch) | |
| tree | 462ce2a6500825e27f3ffa6dc85224151a5608c8 /intern/cycles/device/hip | |
| parent | 059da44fbc30803e019214c852cb2f3b99f97069 (diff) | |
| parent | 336ca6796a7a6ee26ff6d889643df07a37efa554 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/device/hip')
| -rw-r--r-- | intern/cycles/device/hip/device_impl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/device/hip/device_impl.cpp b/intern/cycles/device/hip/device_impl.cpp index 353a933e788..64cd4cd826a 100644 --- a/intern/cycles/device/hip/device_impl.cpp +++ b/intern/cycles/device/hip/device_impl.cpp @@ -738,6 +738,7 @@ void HIPDevice::generic_free(device_memory &mem) if (mem.device_pointer) { HIPContextScope scope(this); thread_scoped_lock lock(hip_mem_map_mutex); + DCHECK(hip_mem_map.find(&mem) != hip_mem_map.end()); const HIPMem &cmem = hip_mem_map[&mem]; /* If cmem.use_mapped_host is true, reference counting is used @@ -980,7 +981,7 @@ void HIPDevice::tex_alloc(device_texture &mem) << string_human_readable_number(mem.memory_size()) << " bytes. (" << string_human_readable_size(mem.memory_size()) << ")"; - hip_assert(hipArray3DCreate((hArray*)&array_3d, &desc)); + hip_assert(hipArray3DCreate((hArray *)&array_3d, &desc)); if (!array_3d) { return; @@ -1106,6 +1107,7 @@ void HIPDevice::tex_free(device_texture &mem) if (mem.device_pointer) { HIPContextScope scope(this); thread_scoped_lock lock(hip_mem_map_mutex); + DCHECK(hip_mem_map.find(&mem) != hip_mem_map.end()); const HIPMem &cmem = hip_mem_map[&mem]; if (cmem.texobject) { |