diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-21 02:09:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-24 02:25:19 +0300 |
commit | 070a668d04844610059aaedc80c49e9038fd1779 (patch) | |
tree | cad5c64972e45b4ee19cc8e11cdd9adedd7a2f08 /intern/cycles/render/buffers.h | |
parent | aa8b4c5d8124c0379eeee9eacd1a0887a573d7d7 (diff) |
Code refactor: move more memory allocation logic into device API.
* Remove tex_* and pixels_* functions, replace by mem_*.
* Add MEM_TEXTURE and MEM_PIXELS as memory types recognized by devices.
* No longer create device_memory and call mem_* directly, always go
through device_only_memory, device_vector and device_pixels.
Diffstat (limited to 'intern/cycles/render/buffers.h')
-rw-r--r-- | intern/cycles/render/buffers.h | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h index 2780fc8a68d..8563d6674ec 100644 --- a/intern/cycles/render/buffers.h +++ b/intern/cycles/render/buffers.h @@ -75,20 +75,15 @@ public: /* float buffer */ device_vector<float> buffer; - Device *device; - explicit RenderBuffers(Device *device); ~RenderBuffers(); - void reset(Device *device, BufferParams& params); - void zero(Device *device); + void reset(BufferParams& params); + void zero(); - bool copy_from_device(Device *from_device = NULL); + bool copy_from_device(); bool get_pass_rect(PassType type, float exposure, int sample, int components, float *pixels); bool get_denoising_pass_rect(int offset, float exposure, int sample, int components, float *pixels); - -protected: - void device_free(); }; /* Display Buffer @@ -109,25 +104,18 @@ public: /* use half float? */ bool half_float; /* byte buffer for converted result */ - device_vector<uchar4> rgba_byte; - device_vector<half4> rgba_half; + device_pixels<uchar4> rgba_byte; + device_pixels<half4> rgba_half; DisplayBuffer(Device *device, bool linear = false); ~DisplayBuffer(); - void reset(Device *device, BufferParams& params); - void write(Device *device, const string& filename); + void reset(BufferParams& params); + void write(const string& filename); void draw_set(int width, int height); void draw(Device *device, const DeviceDrawParams& draw_params); bool draw_ready(); - - device_memory& rgba_data(); - -protected: - void device_free(); - - Device *device; }; /* Render Tile |