diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-25 00:23:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-25 00:53:09 +0300 |
| commit | 34fe3f9c069fc93fde5ec5bafcdfb9294348b58f (patch) | |
| tree | c227512b4ad25813f2590c8d77f35f6ec05a5317 /intern/cycles/device/device_memory.h | |
| parent | fe253389e027c2da3a0d4ad7304f360be64e27e5 (diff) | |
Code refactor: remove MEM_WRITE_ONLY, always use MEM_READ_WRITE.
It's unlikely the driver can do useful optimizations with this, and if
we sum multiple samples we are reading from the memory anyway.
Diffstat (limited to 'intern/cycles/device/device_memory.h')
| -rw-r--r-- | intern/cycles/device/device_memory.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/device/device_memory.h b/intern/cycles/device/device_memory.h index e6b2d059ef3..09b6602a102 100644 --- a/intern/cycles/device/device_memory.h +++ b/intern/cycles/device/device_memory.h @@ -33,7 +33,6 @@ class Device; enum MemoryType { MEM_READ_ONLY, - MEM_WRITE_ONLY, MEM_READ_WRITE, MEM_TEXTURE, MEM_PIXELS @@ -325,13 +324,13 @@ public: device_free(); host_free(data_pointer, sizeof(T)*data_size); data_pointer = new_ptr; + assert(device_pointer == 0); } data_size = new_size; data_width = width; data_height = height; data_depth = depth; - assert(device_pointer == 0); return get_data(); } |