diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-24 03:04:58 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-24 03:05:41 +0300 |
| commit | f5456df095291c6cb2d0223a179746c8e514cd15 (patch) | |
| tree | 76384b0c91806c95d55b007850ee225889a3250e /intern/cycles/device/opencl/memory_manager.h | |
| parent | 254daf8f8c276a4e5292e5a12fcfa88296131878 (diff) | |
| parent | 070a668d04844610059aaedc80c49e9038fd1779 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/opencl/memory_manager.h')
| -rw-r--r-- | intern/cycles/device/opencl/memory_manager.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/device/opencl/memory_manager.h b/intern/cycles/device/opencl/memory_manager.h index 3714405d026..b3d861275f0 100644 --- a/intern/cycles/device/opencl/memory_manager.h +++ b/intern/cycles/device/opencl/memory_manager.h @@ -56,15 +56,17 @@ private: }; struct DeviceBuffer { - device_memory *buffer; + device_only_memory<uchar> *buffer; vector<Allocation*> allocations; size_t size; /* Size of all allocations. */ - DeviceBuffer() : buffer(new device_memory), size(0) + DeviceBuffer() + : buffer(NULL), size(0) { } - ~DeviceBuffer() { + ~DeviceBuffer() + { delete buffer; buffer = NULL; } |