diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 18:07:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 18:07:09 +0300 |
| commit | 0671814e3b9450e0fed5109e059b6f9dc421e120 (patch) | |
| tree | 06994ff0af927c1089bf2c23e82318c700c34d64 /intern/cycles/util | |
| parent | cb4884f50b80c7a5b115bb066b9b662af7e62297 (diff) | |
| parent | 0b5b464e823660f4ce47107d63004e762372122e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_atomic.h | 10 | ||||
| -rw-r--r-- | intern/cycles/util/util_stats.h | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/intern/cycles/util/util_atomic.h b/intern/cycles/util/util_atomic.h index 643af87a65f..f3c7ae546a0 100644 --- a/intern/cycles/util/util_atomic.h +++ b/intern/cycles/util/util_atomic.h @@ -22,16 +22,6 @@ /* Using atomic ops header from Blender. */ #include "atomic_ops.h" -ATOMIC_INLINE void atomic_update_max_z(size_t *maximum_value, size_t value) -{ - size_t prev_value = *maximum_value; - while(prev_value < value) { - if(atomic_cas_z(maximum_value, prev_value, value) != prev_value) { - break; - } - } -} - #define atomic_add_and_fetch_float(p, x) atomic_add_and_fetch_fl((p), (x)) #define atomic_fetch_and_inc_uint32(p) atomic_fetch_and_add_uint32((p), 1) diff --git a/intern/cycles/util/util_stats.h b/intern/cycles/util/util_stats.h index baba549753d..7667f58eb7d 100644 --- a/intern/cycles/util/util_stats.h +++ b/intern/cycles/util/util_stats.h @@ -30,7 +30,7 @@ public: void mem_alloc(size_t size) { atomic_add_and_fetch_z(&mem_used, size); - atomic_update_max_z(&mem_peak, mem_used); + atomic_fetch_and_update_max_z(&mem_peak, mem_used); } void mem_free(size_t size) { |