diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /intern/cycles/render/buffers.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'intern/cycles/render/buffers.h')
-rw-r--r-- | intern/cycles/render/buffers.h | 180 |
1 files changed, 93 insertions, 87 deletions
diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h index 0a010718d6d..1c49038cd4b 100644 --- a/intern/cycles/render/buffers.h +++ b/intern/cycles/render/buffers.h @@ -38,59 +38,65 @@ struct float4; * Size of render buffer and how it fits in the full image (border render). */ class BufferParams { -public: - /* width/height of the physical buffer */ - int width; - int height; - - /* offset into and width/height of the full buffer */ - int full_x; - int full_y; - int full_width; - int full_height; - - /* passes */ - vector<Pass> passes; - bool denoising_data_pass; - /* If only some light path types should be denoised, an additional pass is needed. */ - bool denoising_clean_pass; - /* When we're prefiltering the passes during rendering, we need to keep both the - * original and the prefiltered data around because neighboring tiles might still - * need the original data. */ - bool denoising_prefiltered_pass; - - /* functions */ - BufferParams(); - - void get_offset_stride(int& offset, int& stride); - bool modified(const BufferParams& params); - void add_pass(PassType type); - int get_passes_size(); - int get_denoising_offset(); - int get_denoising_prefiltered_offset(); + public: + /* width/height of the physical buffer */ + int width; + int height; + + /* offset into and width/height of the full buffer */ + int full_x; + int full_y; + int full_width; + int full_height; + + /* passes */ + vector<Pass> passes; + bool denoising_data_pass; + /* If only some light path types should be denoised, an additional pass is needed. */ + bool denoising_clean_pass; + /* When we're prefiltering the passes during rendering, we need to keep both the + * original and the prefiltered data around because neighboring tiles might still + * need the original data. */ + bool denoising_prefiltered_pass; + + /* functions */ + BufferParams(); + + void get_offset_stride(int &offset, int &stride); + bool modified(const BufferParams ¶ms); + void add_pass(PassType type); + int get_passes_size(); + int get_denoising_offset(); + int get_denoising_prefiltered_offset(); }; /* Render Buffers */ class RenderBuffers { -public: - /* buffer parameters */ - BufferParams params; - - /* float buffer */ - device_vector<float> buffer; - bool map_neighbor_copied; - double render_time; - - explicit RenderBuffers(Device *device); - ~RenderBuffers(); - - void reset(BufferParams& params); - void zero(); - - bool copy_from_device(); - bool get_pass_rect(PassType type, float exposure, int sample, int components, float *pixels, const string &name); - bool get_denoising_pass_rect(int offset, float exposure, int sample, int components, float *pixels); + public: + /* buffer parameters */ + BufferParams params; + + /* float buffer */ + device_vector<float> buffer; + bool map_neighbor_copied; + double render_time; + + explicit RenderBuffers(Device *device); + ~RenderBuffers(); + + void reset(BufferParams ¶ms); + void zero(); + + bool copy_from_device(); + bool get_pass_rect(PassType type, + float exposure, + int sample, + int components, + float *pixels, + const string &name); + bool get_denoising_pass_rect( + int offset, float exposure, int sample, int components, float *pixels); }; /* Display Buffer @@ -99,56 +105,56 @@ public: * buffers to byte of half float storage */ class DisplayBuffer { -public: - /* buffer parameters */ - BufferParams params; - /* dimensions for how much of the buffer is actually ready for display. - * with progressive render we can be using only a subset of the buffer. - * if these are zero, it means nothing can be drawn yet */ - int draw_width, draw_height; - /* draw alpha channel? */ - bool transparent; - /* use half float? */ - bool half_float; - /* byte buffer for converted result */ - device_pixels<uchar4> rgba_byte; - device_pixels<half4> rgba_half; - - DisplayBuffer(Device *device, bool linear = false); - ~DisplayBuffer(); - - void reset(BufferParams& params); - - void draw_set(int width, int height); - void draw(Device *device, const DeviceDrawParams& draw_params); - bool draw_ready(); + public: + /* buffer parameters */ + BufferParams params; + /* dimensions for how much of the buffer is actually ready for display. + * with progressive render we can be using only a subset of the buffer. + * if these are zero, it means nothing can be drawn yet */ + int draw_width, draw_height; + /* draw alpha channel? */ + bool transparent; + /* use half float? */ + bool half_float; + /* byte buffer for converted result */ + device_pixels<uchar4> rgba_byte; + device_pixels<half4> rgba_half; + + DisplayBuffer(Device *device, bool linear = false); + ~DisplayBuffer(); + + void reset(BufferParams ¶ms); + + void draw_set(int width, int height); + void draw(Device *device, const DeviceDrawParams &draw_params); + bool draw_ready(); }; /* Render Tile * Rendering task on a buffer */ class RenderTile { -public: - typedef enum { PATH_TRACE, DENOISE } Task; + public: + typedef enum { PATH_TRACE, DENOISE } Task; - Task task; - int x, y, w, h; - int start_sample; - int num_samples; - int sample; - int resolution; - int offset; - int stride; - int tile_index; + Task task; + int x, y, w, h; + int start_sample; + int num_samples; + int sample; + int resolution; + int offset; + int stride; + int tile_index; - device_ptr buffer; - int device_size; + device_ptr buffer; + int device_size; - RenderBuffers *buffers; + RenderBuffers *buffers; - RenderTile(); + RenderTile(); }; CCL_NAMESPACE_END -#endif /* __BUFFERS_H__ */ +#endif /* __BUFFERS_H__ */ |