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 /source/blender/render/intern/include/render_result.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 'source/blender/render/intern/include/render_result.h')
-rw-r--r-- | source/blender/render/intern/include/render_result.h | 105 |
1 files changed, 64 insertions, 41 deletions
diff --git a/source/blender/render/intern/include/render_result.h b/source/blender/render/intern/include/render_result.h index d7636a150ef..24356194f5d 100644 --- a/source/blender/render/intern/include/render_result.h +++ b/source/blender/render/intern/include/render_result.h @@ -24,13 +24,13 @@ #ifndef __RENDER_RESULT_H__ #define __RENDER_RESULT_H__ -#define PASS_VECTOR_MAX 10000.0f +#define PASS_VECTOR_MAX 10000.0f -#define RR_USE_MEM 0 -#define RR_USE_EXR 1 +#define RR_USE_MEM 0 +#define RR_USE_EXR 1 -#define RR_ALL_LAYERS NULL -#define RR_ALL_VIEWS NULL +#define RR_ALL_LAYERS NULL +#define RR_ALL_VIEWS NULL struct ColorManagedDisplaySettings; struct ColorManagedViewSettings; @@ -47,9 +47,14 @@ struct rcti; /* New */ struct RenderResult *render_result_new(struct Render *re, - struct rcti *partrct, int crop, int savebuffers, const char *layername, const char *viewname); + struct rcti *partrct, + int crop, + int savebuffers, + const char *layername, + const char *viewname); -struct RenderResult *render_result_new_from_exr(void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty); +struct RenderResult *render_result_new_from_exr( + void *exrhandle, const char *colorspace, bool predivide, int rectx, int recty); void render_result_view_new(struct RenderResult *rr, const char *viewname); void render_result_views_new(struct RenderResult *rr, struct RenderData *rd); @@ -61,7 +66,12 @@ void render_result_merge(struct RenderResult *rr, struct RenderResult *rrpart); /* Add Passes */ void render_result_clone_passes(struct Render *re, struct RenderResult *rr, const char *viewname); -void render_result_add_pass(struct RenderResult *rr, const char *name, int channels, const char *chan_id, const char *layername, const char *viewname); +void render_result_add_pass(struct RenderResult *rr, + const char *name, + int channels, + const char *chan_id, + const char *layername, + const char *viewname); /* Free */ @@ -80,12 +90,23 @@ void render_result_exr_file_begin(struct Render *re, struct RenderEngine *engine void render_result_exr_file_end(struct Render *re, struct RenderEngine *engine); /* render pass wrapper for gpencil */ -struct RenderPass *gp_add_pass(struct RenderResult *rr, struct RenderLayer *rl, int channels, const char *name, const char *viewname); - -void render_result_exr_file_merge(struct RenderResult *rr, struct RenderResult *rrpart, const char *viewname); - -void render_result_exr_file_path(struct Scene *scene, const char *layname, int sample, char *filepath); -int render_result_exr_file_read_path(struct RenderResult *rr, struct RenderLayer *rl_single, const char *filepath); +struct RenderPass *gp_add_pass(struct RenderResult *rr, + struct RenderLayer *rl, + int channels, + const char *name, + const char *viewname); + +void render_result_exr_file_merge(struct RenderResult *rr, + struct RenderResult *rrpart, + const char *viewname); + +void render_result_exr_file_path(struct Scene *scene, + const char *layname, + int sample, + char *filepath); +int render_result_exr_file_read_path(struct RenderResult *rr, + struct RenderLayer *rl_single, + const char *filepath); /* EXR cache */ @@ -94,40 +115,42 @@ bool render_result_exr_file_cache_read(struct Render *re); /* Combined Pixel Rect */ -struct ImBuf *render_result_rect_to_ibuf(struct RenderResult *rr, struct RenderData *rd, const int view_id); +struct ImBuf *render_result_rect_to_ibuf(struct RenderResult *rr, + struct RenderData *rd, + const int view_id); void render_result_rect_fill_zero(struct RenderResult *rr, const int view_id); void render_result_rect_get_pixels(struct RenderResult *rr, - unsigned int *rect, int rectx, int recty, - const struct ColorManagedViewSettings *view_settings, - const struct ColorManagedDisplaySettings *display_settings, - const int view_id); + unsigned int *rect, + int rectx, + int recty, + const struct ColorManagedViewSettings *view_settings, + const struct ColorManagedDisplaySettings *display_settings, + const int view_id); void render_result_views_shallowcopy(struct RenderResult *dst, struct RenderResult *src); void render_result_views_shallowdelete(struct RenderResult *rr); bool render_result_has_views(struct RenderResult *rr); -#define FOREACH_VIEW_LAYER_TO_RENDER_BEGIN(re_, iter_) \ -{ \ - int nr_; \ - ViewLayer *iter_; \ - for (nr_ = 0, iter_ = (re_)->view_layers.first; \ - iter_ != NULL; \ - iter_ = iter_->next, nr_++) \ - { \ - if (!G.background && (re_)->r.scemode & R_SINGLE_LAYER) { \ - if (nr_ != re->active_view_layer) { \ - continue; \ - } \ - } \ - else { \ - if ((iter_->flag & VIEW_LAYER_RENDER) == 0) { \ - continue; \ - } \ - } - -#define FOREACH_VIEW_LAYER_TO_RENDER_END \ - } \ -} ((void)0) +#define FOREACH_VIEW_LAYER_TO_RENDER_BEGIN(re_, iter_) \ + { \ + int nr_; \ + ViewLayer *iter_; \ + for (nr_ = 0, iter_ = (re_)->view_layers.first; iter_ != NULL; iter_ = iter_->next, nr_++) { \ + if (!G.background && (re_)->r.scemode & R_SINGLE_LAYER) { \ + if (nr_ != re->active_view_layer) { \ + continue; \ + } \ + } \ + else { \ + if ((iter_->flag & VIEW_LAYER_RENDER) == 0) { \ + continue; \ + } \ + } + +#define FOREACH_VIEW_LAYER_TO_RENDER_END \ + } \ + } \ + ((void)0) #endif /* __RENDER_RESULT_H__ */ |