diff options
author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-07-04 14:19:12 +0300 |
---|---|---|
committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-07-04 15:37:55 +0300 |
commit | f1525cf53462b5841f2f50283ae2926ab990170e (patch) | |
tree | 2dfb94f861752a092adf9ba6ee5394bef6758fd7 /intern/cycles/device/device_memory.cpp | |
parent | 9db8bdbc653eb783707a748a271797510144a8eb (diff) |
Cycles Denoising: Correctly handle target buffer in tile unmapping and move device swap logic to the device_memory
Diffstat (limited to 'intern/cycles/device/device_memory.cpp')
-rw-r--r-- | intern/cycles/device/device_memory.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/intern/cycles/device/device_memory.cpp b/intern/cycles/device/device_memory.cpp index c6248fcf88b..482af685011 100644 --- a/intern/cycles/device/device_memory.cpp +++ b/intern/cycles/device/device_memory.cpp @@ -104,6 +104,26 @@ void device_memory::device_zero() } } +void device_memory::swap_device(Device *new_device, + size_t new_device_size, + device_ptr new_device_ptr) +{ + original_device = device; + original_device_size = device_size; + original_device_ptr = device_pointer; + + device = new_device; + device_size = new_device_size; + device_pointer = new_device_ptr; +} + +void device_memory::restore_device() +{ + device = original_device; + device_size = original_device_size; + device_pointer = original_device_ptr; +} + /* Device Sub Ptr */ device_sub_ptr::device_sub_ptr(device_memory& mem, int offset, int size) |