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

6 files changed, 223 insertions, 173 deletions

diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h
index 1c290084fbc..99282a8e703 100644
--- a/source/blender/render/intern/include/initrender.h
+++ b/source/blender/render/intern/include/initrender.h
@@ -21,7 +21,6 @@
  * \ingroup render
  */
 
-
 #ifndef __INITRENDER_H__
 #define __INITRENDER_H__
 
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__ */
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__ */
diff --git a/source/blender/render/intern/include/renderpipeline.h b/source/blender/render/intern/include/renderpipeline.h
index 7479de8b707..12b231ef55f 100644
--- a/source/blender/render/intern/include/renderpipeline.h
+++ b/source/blender/render/intern/include/renderpipeline.h
@@ -21,7 +21,6 @@
  * \ingroup render
  */
 
-
 #ifndef __RENDERPIPELINE_H__
 #define __RENDERPIPELINE_H__
 
@@ -32,7 +31,9 @@ struct RenderLayer;
 struct RenderResult;
 
 struct RenderLayer *render_get_active_layer(struct Render *re, struct RenderResult *rr);
-void render_update_anim_renderdata(struct Render *re, struct RenderData *rd, struct ListBase *render_layers);
+void render_update_anim_renderdata(struct Render *re,
+                                   struct RenderData *rd,
+                                   struct ListBase *render_layers);
 void render_copy_renderdata(struct RenderData *to, struct RenderData *from);
 
 #endif /* __RENDERPIPELINE_H__ */
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h
index 7c86f700652..d783263c8b8 100644
--- a/source/blender/render/intern/include/texture.h
+++ b/source/blender/render/intern/include/texture.h
@@ -21,39 +21,44 @@
  * \ingroup render
  */
 
-
 #ifndef __TEXTURE_H__
 #define __TEXTURE_H__
 
-#define BRICONT                                                           \
-	texres->tin= (texres->tin-0.5f) * tex->contrast+tex->bright-0.5f;     \
-	if (!(tex->flag & TEX_NO_CLAMP)) {                                    \
-		if (texres->tin < 0.0f)      texres->tin= 0.0f;                   \
-		else if (texres->tin > 1.0f) texres->tin= 1.0f;                   \
-	}                                                                     \
+#define BRICONT \
+  texres->tin = (texres->tin - 0.5f) * tex->contrast + tex->bright - 0.5f; \
+  if (!(tex->flag & TEX_NO_CLAMP)) { \
+    if (texres->tin < 0.0f) \
+      texres->tin = 0.0f; \
+    else if (texres->tin > 1.0f) \
+      texres->tin = 1.0f; \
+  }
 
-#define BRICONTRGB                                                            \
-	texres->tr= tex->rfac*((texres->tr-0.5f)*tex->contrast+tex->bright-0.5f); \
-	texres->tg= tex->gfac*((texres->tg-0.5f)*tex->contrast+tex->bright-0.5f); \
-	texres->tb= tex->bfac*((texres->tb-0.5f)*tex->contrast+tex->bright-0.5f); \
-	if (!(tex->flag & TEX_NO_CLAMP)) {                                        \
-		if (texres->tr < 0.0f) texres->tr= 0.0f;                              \
-		if (texres->tg < 0.0f) texres->tg= 0.0f;                              \
-		if (texres->tb < 0.0f) texres->tb= 0.0f;                              \
-	}                                                                         \
-	if (tex->saturation != 1.0f) {                                            \
-		float _hsv[3];                                                        \
-		rgb_to_hsv(texres->tr, texres->tg, texres->tb,                        \
-		           _hsv, _hsv+1, _hsv+2);                                     \
-		_hsv[1] *= tex->saturation;                                           \
-		hsv_to_rgb(_hsv[0], _hsv[1], _hsv[2],                                 \
-		           &texres->tr, &texres->tg, &texres->tb);                    \
-		if ((tex->saturation > 1.0f) && !(tex->flag & TEX_NO_CLAMP)) {        \
-			if (texres->tr < 0.0f) texres->tr= 0.0f;                          \
-			if (texres->tg < 0.0f) texres->tg= 0.0f;                          \
-			if (texres->tb < 0.0f) texres->tb= 0.0f;                          \
-		}                                                                     \
-	}                                                                         \
+#define BRICONTRGB \
+  texres->tr = tex->rfac * ((texres->tr - 0.5f) * tex->contrast + tex->bright - 0.5f); \
+  texres->tg = tex->gfac * ((texres->tg - 0.5f) * tex->contrast + tex->bright - 0.5f); \
+  texres->tb = tex->bfac * ((texres->tb - 0.5f) * tex->contrast + tex->bright - 0.5f); \
+  if (!(tex->flag & TEX_NO_CLAMP)) { \
+    if (texres->tr < 0.0f) \
+      texres->tr = 0.0f; \
+    if (texres->tg < 0.0f) \
+      texres->tg = 0.0f; \
+    if (texres->tb < 0.0f) \
+      texres->tb = 0.0f; \
+  } \
+  if (tex->saturation != 1.0f) { \
+    float _hsv[3]; \
+    rgb_to_hsv(texres->tr, texres->tg, texres->tb, _hsv, _hsv + 1, _hsv + 2); \
+    _hsv[1] *= tex->saturation; \
+    hsv_to_rgb(_hsv[0], _hsv[1], _hsv[2], &texres->tr, &texres->tg, &texres->tb); \
+    if ((tex->saturation > 1.0f) && !(tex->flag & TEX_NO_CLAMP)) { \
+      if (texres->tr < 0.0f) \
+        texres->tr = 0.0f; \
+      if (texres->tg < 0.0f) \
+        texres->tg = 0.0f; \
+      if (texres->tb < 0.0f) \
+        texres->tb = 0.0f; \
+    } \
+  }
 
 struct ImBuf;
 struct Image;
@@ -63,8 +68,28 @@ struct TexResult;
 
 /* imagetexture.h */
 
-int imagewraposa(struct Tex *tex, struct Image *ima, struct ImBuf *ibuf, const float texvec[3], const float dxt[2], const float dyt[2], struct TexResult *texres, struct ImagePool *pool, const bool skip_load_image);
-int imagewrap(struct Tex *tex, struct Image *ima, struct ImBuf *ibuf, const float texvec[3], struct TexResult *texres, struct ImagePool *pool, const bool skip_load_image);
-void image_sample(struct Image *ima, float fx, float fy, float dx, float dy, float result[4], struct ImagePool *pool);
+int imagewraposa(struct Tex *tex,
+                 struct Image *ima,
+                 struct ImBuf *ibuf,
+                 const float texvec[3],
+                 const float dxt[2],
+                 const float dyt[2],
+                 struct TexResult *texres,
+                 struct ImagePool *pool,
+                 const bool skip_load_image);
+int imagewrap(struct Tex *tex,
+              struct Image *ima,
+              struct ImBuf *ibuf,
+              const float texvec[3],
+              struct TexResult *texres,
+              struct ImagePool *pool,
+              const bool skip_load_image);
+void image_sample(struct Image *ima,
+                  float fx,
+                  float fy,
+                  float dx,
+                  float dy,
+                  float result[4],
+                  struct ImagePool *pool);
 
 #endif /* __TEXTURE_H__ */
diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h
index b5f4fffb0a9..bc6addd6c5f 100644
--- a/source/blender/render/intern/include/zbuf.h
+++ b/source/blender/render/intern/include/zbuf.h
@@ -18,23 +18,26 @@
  * \ingroup render
  */
 
-
 #ifndef __ZBUF_H__
 #define __ZBUF_H__
 
 /* span fill in method, is also used to localize data for zbuffering */
 typedef struct ZSpan {
-	int rectx, recty;						/* range for clipping */
+  int rectx, recty; /* range for clipping */
 
-	int miny1, maxy1, miny2, maxy2;			/* actual filled in range */
-	const float *minp1, *maxp1, *minp2, *maxp2;	/* vertex pointers detect min/max range in */
-	float *span1, *span2;
+  int miny1, maxy1, miny2, maxy2;             /* actual filled in range */
+  const float *minp1, *maxp1, *minp2, *maxp2; /* vertex pointers detect min/max range in */
+  float *span1, *span2;
 } ZSpan;
 
 void zbuf_alloc_span(struct ZSpan *zspan, int rectx, int recty);
 void zbuf_free_span(struct ZSpan *zspan);
 
-void zspan_scanconvert(struct ZSpan *zpan, void *handle, float *v1, float *v2, float *v3,
-                       void (*func)(void *, int, int, float, float) );
+void zspan_scanconvert(struct ZSpan *zpan,
+                       void *handle,
+                       float *v1,
+                       float *v2,
+                       float *v3,
+                       void (*func)(void *, int, int, float, float));
 
 #endif