Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/render/intern/include/render_types.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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_types.h')
-rw-r--r--source/blender/render/intern/include/render_types.h179
1 files changed, 89 insertions, 90 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index a4533c6cdec..69e2ea991dd 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -21,7 +21,6 @@
* \ingroup render
*/
-
#ifndef __RENDER_TYPES_H__
#define __RENDER_TYPES_H__
@@ -45,118 +44,118 @@ struct ReportList;
/* this is handed over to threaded hiding/passes/shading engine */
typedef struct RenderPart {
- struct RenderPart *next, *prev;
+ struct RenderPart *next, *prev;
- RenderResult *result; /* result of part rendering */
- ListBase fullresult; /* optional full sample buffers */
+ RenderResult *result; /* result of part rendering */
+ ListBase fullresult; /* optional full sample buffers */
- rcti disprect; /* part coordinates within total picture */
- int rectx, recty; /* the size */
- int nr; /* nr is partnr */
- short status;
+ rcti disprect; /* part coordinates within total picture */
+ int rectx, recty; /* the size */
+ int nr; /* nr is partnr */
+ short status;
} RenderPart;
enum {
- PART_STATUS_NONE = 0,
- PART_STATUS_IN_PROGRESS = 1,
- PART_STATUS_RENDERED = 2,
- PART_STATUS_MERGED = 3,
+ PART_STATUS_NONE = 0,
+ PART_STATUS_IN_PROGRESS = 1,
+ PART_STATUS_RENDERED = 2,
+ PART_STATUS_MERGED = 3,
};
/* controls state of render, everything that's read-only during render stage */
struct Render {
- struct Render *next, *prev;
- char name[RE_MAXNAME];
- int slot;
-
- /* state settings */
- short flag, ok, result_ok;
-
- /* result of rendering */
- RenderResult *result;
- /* if render with single-layer option, other rendered layers are stored here */
- RenderResult *pushedresult;
- /* a list of RenderResults, for fullsample */
- ListBase fullresult;
- /* read/write mutex, all internal code that writes to re->result must use a
- * write lock, all external code must use a read lock. internal code is assumed
- * to not conflict with writes, so no lock used for that */
- ThreadRWMutex resultmutex;
-
- /* window size, display rect, viewplane */
- int winx, winy; /* buffer width and height with percentage applied
- * without border & crop. convert to long before multiplying together to avoid overflow. */
- rcti disprect; /* part within winx winy */
- rctf viewplane; /* mapped on winx winy */
-
- /* final picture width and height (within disprect) */
- int rectx, recty;
-
- /* real maximum size of parts after correction for minimum
- * partx*xparts can be larger than rectx, in that case last part is smaller */
- int partx, party;
-
- /* Camera transform, only used by Freestyle. */
- float winmat[4][4];
-
- /* clippping */
- float clip_start;
- float clip_end;
-
- /* main, scene, and its full copy of renderdata and world */
- struct Main *main;
- Scene *scene;
- RenderData r;
- ListBase view_layers;
- int active_view_layer;
- struct Object *camera_override;
-
- ThreadRWMutex partsmutex;
- ListBase parts;
-
- /* render engine */
- struct RenderEngine *engine;
+ struct Render *next, *prev;
+ char name[RE_MAXNAME];
+ int slot;
+
+ /* state settings */
+ short flag, ok, result_ok;
+
+ /* result of rendering */
+ RenderResult *result;
+ /* if render with single-layer option, other rendered layers are stored here */
+ RenderResult *pushedresult;
+ /* a list of RenderResults, for fullsample */
+ ListBase fullresult;
+ /* read/write mutex, all internal code that writes to re->result must use a
+ * write lock, all external code must use a read lock. internal code is assumed
+ * to not conflict with writes, so no lock used for that */
+ ThreadRWMutex resultmutex;
+
+ /* window size, display rect, viewplane */
+ int winx, winy; /* buffer width and height with percentage applied
+ * without border & crop. convert to long before multiplying together to avoid overflow. */
+ rcti disprect; /* part within winx winy */
+ rctf viewplane; /* mapped on winx winy */
+
+ /* final picture width and height (within disprect) */
+ int rectx, recty;
+
+ /* real maximum size of parts after correction for minimum
+ * partx*xparts can be larger than rectx, in that case last part is smaller */
+ int partx, party;
+
+ /* Camera transform, only used by Freestyle. */
+ float winmat[4][4];
+
+ /* clippping */
+ float clip_start;
+ float clip_end;
+
+ /* main, scene, and its full copy of renderdata and world */
+ struct Main *main;
+ Scene *scene;
+ RenderData r;
+ ListBase view_layers;
+ int active_view_layer;
+ struct Object *camera_override;
+
+ ThreadRWMutex partsmutex;
+ ListBase parts;
+
+ /* render engine */
+ struct RenderEngine *engine;
#ifdef WITH_FREESTYLE
- struct Main *freestyle_bmain;
- ListBase freestyle_renders;
+ struct Main *freestyle_bmain;
+ ListBase freestyle_renders;
#endif
- /* callbacks */
- void (*display_init)(void *handle, RenderResult *rr);
- void *dih;
- void (*display_clear)(void *handle, RenderResult *rr);
- void *dch;
- void (*display_update)(void *handle, RenderResult *rr, volatile rcti *rect);
- void *duh;
- void (*current_scene_update)(void *handle, struct Scene *scene);
- void *suh;
+ /* callbacks */
+ void (*display_init)(void *handle, RenderResult *rr);
+ void *dih;
+ void (*display_clear)(void *handle, RenderResult *rr);
+ void *dch;
+ void (*display_update)(void *handle, RenderResult *rr, volatile rcti *rect);
+ void *duh;
+ void (*current_scene_update)(void *handle, struct Scene *scene);
+ void *suh;
- void (*stats_draw)(void *handle, RenderStats *ri);
- void *sdh;
- void (*progress)(void *handle, float i);
- void *prh;
+ void (*stats_draw)(void *handle, RenderStats *ri);
+ void *sdh;
+ void (*progress)(void *handle, float i);
+ void *prh;
- void (*draw_lock)(void *handle, int i);
- void *dlh;
- int (*test_break)(void *handle);
- void *tbh;
+ void (*draw_lock)(void *handle, int i);
+ void *dlh;
+ int (*test_break)(void *handle);
+ void *tbh;
- RenderStats i;
+ RenderStats i;
- struct ReportList *reports;
+ struct ReportList *reports;
- void **movie_ctx_arr;
- char viewname[MAX_NAME];
+ void **movie_ctx_arr;
+ char viewname[MAX_NAME];
- /* TODO replace by a whole draw manager. */
- void *gl_context;
- void *gpu_context;
+ /* TODO replace by a whole draw manager. */
+ void *gl_context;
+ void *gpu_context;
};
/* **************** defines ********************* */
/* R.flag */
-#define R_ANIMATION 1
+#define R_ANIMATION 1
#endif /* __RENDER_TYPES_H__ */