diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-02-22 17:33:15 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-02-22 17:33:15 +0300 |
| commit | e143103447a9700e3dfa434e964be9575052981e (patch) | |
| tree | 5ffe868e080407221245dab425f5db1eedc15b33 /intern/cycles/device/device_multi.cpp | |
| parent | ae8afae8a27013aaa121f26232fa44d746c19f83 (diff) | |
| parent | 75cc33fa20457695d33e90886e8802c28fd96c2a (diff) | |
Merge branch 'master' into cycles_split_kernel
Diffstat (limited to 'intern/cycles/device/device_multi.cpp')
| -rw-r--r-- | intern/cycles/device/device_multi.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 7d658df1b57..3368fd3d756 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -162,6 +162,7 @@ public: void mem_free(device_memory& mem) { device_ptr tmp = mem.device_pointer; + stats.mem_free(mem.device_size); foreach(SubDevice& sub, devices) { mem.device_pointer = sub.ptr_map[tmp]; @@ -170,7 +171,6 @@ public: } mem.device_pointer = 0; - stats.mem_free(mem.device_size); } void const_copy_to(const char *name, void *host, size_t size) @@ -202,6 +202,7 @@ public: void tex_free(device_memory& mem) { device_ptr tmp = mem.device_pointer; + stats.mem_free(mem.device_size); foreach(SubDevice& sub, devices) { mem.device_pointer = sub.ptr_map[tmp]; @@ -210,7 +211,6 @@ public: } mem.device_pointer = 0; - stats.mem_free(mem.device_size); } void pixels_alloc(device_memory& mem) |