diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-05-08 01:19:22 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-05-08 01:19:22 +0300 |
| commit | 9181f13af710f39e28368461f9979ce2052a55ee (patch) | |
| tree | bb4dae8ee41e31d25ba980aa996c3e62539a59e0 /intern/cycles/device/device.cpp | |
| parent | c47926542acf1fc342b4d0b8f7ccaf1e3a8be6d8 (diff) | |
| parent | ce28025eaf5014f16460dd1cb798ce5292087d94 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 4c4e862ed1f..949c5f932a4 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -549,4 +549,16 @@ void Device::free_memory() devices.free_memory(); } + +device_sub_ptr::device_sub_ptr(Device *device, device_memory& mem, int offset, int size, MemoryType type) + : device(device) +{ + ptr = device->mem_alloc_sub_ptr(mem, offset, size, type); +} + +device_sub_ptr::~device_sub_ptr() +{ + device->mem_free_sub_ptr(ptr); +} + CCL_NAMESPACE_END |