diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-21 00:31:13 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-24 02:03:59 +0300 |
| commit | 7ad9333fad25b9a7cabea0d659eaf724f89912c8 (patch) | |
| tree | 4fa0d78c9659dd842852420bd1d8b8f8925a0c2f /intern/cycles/device/device.cpp | |
| parent | ae41f38f78f8c54f92cf34dd88e35948e19aed55 (diff) | |
Code refactor: store device/interp/extension/type in each device_memory.
Diffstat (limited to 'intern/cycles/device/device.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 16c027e2cb5..9de10c184fb 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -87,7 +87,7 @@ Device::~Device() void Device::pixels_alloc(device_memory& mem) { - mem_alloc("pixels", mem, MEM_READ_WRITE); + mem_alloc(mem); } void Device::pixels_copy_from(device_memory& mem, int y, int w, int h) @@ -429,16 +429,4 @@ 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 |