[Bf-blender-cvs] [5c74b0964bd] master: Cleanup: add iterator macros to clang-format

Campbell Barton noreply at git.blender.org
Fri Mar 27 01:36:22 CET 2020


Commit: 5c74b0964bd624fb10e1293920d8df3b089115dd
Author: Campbell Barton
Date:   Fri Mar 27 11:16:17 2020 +1100
Branches: master
https://developer.blender.org/rB5c74b0964bd624fb10e1293920d8df3b089115dd

Cleanup: add iterator macros to clang-format

Also rename START to BEGIN (matching BEGIN/END for most iterator macros).

===================================================================

M	.clang-format
M	source/blender/draw/engines/eevee/eevee_materials.c
M	source/blender/draw/intern/draw_cache_impl_displist.c
M	source/blender/draw/intern/draw_cache_impl_mesh.c
M	source/blender/editors/gpencil/gpencil_select.c
M	source/blender/editors/gpencil/gpencil_uv.c
M	source/blender/editors/interface/view2d.c

===================================================================

diff --git a/.clang-format b/.clang-format
index 56740fd1036..f08d62bd7b9 100644
--- a/.clang-format
+++ b/.clang-format
@@ -191,6 +191,7 @@ ForEachMacros:
   - FOREACH_MAIN_ID_BEGIN
   - FOREACH_MAIN_LISTBASE_BEGIN
   - FOREACH_MAIN_LISTBASE_ID_BEGIN
+  - FOREACH_MESH_BUFFER_CACHE
   - FOREACH_NODETREE_BEGIN
   - FOREACH_OBJECT_BEGIN
   - FOREACH_OBJECT_FLAG_BEGIN
@@ -213,6 +214,7 @@ ForEachMacros:
   - GHASH_ITER_INDEX
   - GPU_SELECT_LOAD_IF_PICKSEL_LIST
   - GP_EDITABLE_STROKES_BEGIN
+  - GP_EVALUATED_STROKES_BEGIN
   - GSET_FOREACH_BEGIN
   - GSET_ITER
   - GSET_ITER_INDEX
@@ -236,7 +238,6 @@ ForEachMacros:
   - LISTBASE_FOREACH_BACKWARD
   - LISTBASE_FOREACH_MUTABLE
   - LISTBASE_FOREACH_BACKWARD_MUTABLE
-  - MAN2D_ITER_AXES_BEGIN
   - MAN_ITER_AXES_BEGIN
   - NODE_INSTANCE_HASH_ITER
   - NODE_SOCKET_TYPES_BEGIN
@@ -244,6 +245,7 @@ ForEachMacros:
   - NODE_TYPES_BEGIN
   - PIXEL_LOOPER_BEGIN
   - PIXEL_LOOPER_BEGIN_CHANNELS
+  - RENDER_PASS_ITER_BEGIN
   - RNA_BEGIN
   - RNA_PROP_BEGIN
   - RNA_STRUCT_BEGIN
@@ -252,6 +254,7 @@ ForEachMacros:
   - SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN
   - SEQP_BEGIN
   - SEQ_BEGIN
+  - SURFACE_QUAD_ITER_BEGIN
   - foreach
 
 # Use once we bump the minimum version to version 8.
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 79087ddfa9e..4a1f0a081b2 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -134,7 +134,8 @@ extern char datatoc_gpu_shader_uniform_color_frag_glsl[];
   render_pass_index_ += 1; \
   } \
   } \
-  }
+  } \
+  ((void)0)
 
 /* *********** FUNCTIONS *********** */
 
@@ -1562,21 +1563,22 @@ static void material_opaque(Material *ma,
           }
         }
 
-        RENDER_PASS_ITER_BEGIN(stl->g_data->render_passes, render_pass_index, render_pass_flag)
-        emsg->material_accum_grp[render_pass_index] = DRW_shgroup_material_create(
-            *gpumat, psl->material_accum_pass[render_pass_index]);
-        add_standard_uniforms(emsg->material_accum_grp[render_pass_index],
-                              sldata,
-                              vedata,
-                              ssr_id,
-                              &ma->refract_depth,
-                              use_diffuse,
-                              use_glossy,
-                              use_refract,
-                              use_ssrefract,
-                              false,
-                              render_pass_flag);
-        RENDER_PASS_ITER_END(render_pass_index)
+        RENDER_PASS_ITER_BEGIN (stl->g_data->render_passes, render_pass_index, render_pass_flag) {
+          emsg->material_accum_grp[render_pass_index] = DRW_shgroup_material_create(
+              *gpumat, psl->material_accum_pass[render_pass_index]);
+          add_standard_uniforms(emsg->material_accum_grp[render_pass_index],
+                                sldata,
+                                vedata,
+                                ssr_id,
+                                &ma->refract_depth,
+                                use_diffuse,
+                                use_glossy,
+                                use_refract,
+                                use_ssrefract,
+                                false,
+                                render_pass_flag);
+        }
+        RENDER_PASS_ITER_END(render_pass_index);
 
         break;
       }
@@ -1605,21 +1607,22 @@ static void material_opaque(Material *ma,
     DRW_shgroup_uniform_float(emsg->shading_grp, "specular", spec_p, 1);
     DRW_shgroup_uniform_float(emsg->shading_grp, "roughness", rough_p, 1);
 
-    RENDER_PASS_ITER_BEGIN(stl->g_data->render_passes, render_pass_index, render_pass_flag)
-    DRWShadingGroup *shgrp = EEVEE_default_render_pass_shading_group_get(
-        sldata,
-        vedata,
-        holdout,
-        use_ssr,
-        psl->material_accum_pass[render_pass_index],
-        render_pass_flag);
-
-    DRW_shgroup_uniform_vec3(shgrp, "basecol", color_p, 1);
-    DRW_shgroup_uniform_float(shgrp, "metallic", metal_p, 1);
-    DRW_shgroup_uniform_float(shgrp, "specular", spec_p, 1);
-    DRW_shgroup_uniform_float(shgrp, "roughness", rough_p, 1);
-    emsg->material_accum_grp[render_pass_index] = shgrp;
-    RENDER_PASS_ITER_END(render_pass_index)
+    RENDER_PASS_ITER_BEGIN (stl->g_data->render_passes, render_pass_index, render_pass_flag) {
+      DRWShadingGroup *shgrp = EEVEE_default_render_pass_shading_group_get(
+          sldata,
+          vedata,
+          holdout,
+          use_ssr,
+          psl->material_accum_pass[render_pass_index],
+          render_pass_flag);
+
+      DRW_shgroup_uniform_vec3(shgrp, "basecol", color_p, 1);
+      DRW_shgroup_uniform_float(shgrp, "metallic", metal_p, 1);
+      DRW_shgroup_uniform_float(shgrp, "specular", spec_p, 1);
+      DRW_shgroup_uniform_float(shgrp, "roughness", rough_p, 1);
+      emsg->material_accum_grp[render_pass_index] = shgrp;
+    }
+    RENDER_PASS_ITER_END(render_pass_index);
   }
 
   /* Fallback default depth prepass */
@@ -1893,28 +1896,29 @@ static void eevee_hair_cache_populate(EEVEE_Data *vedata,
                               DEFAULT_RENDER_PASS_FLAG);
 
         /* Add the hair to all the render_passes that are enabled */
-        RENDER_PASS_ITER_BEGIN(stl->g_data->render_passes, render_pass_index, render_pass_flag)
-        shgrp = DRW_shgroup_material_hair_create(
-            ob, psys, md, psl->material_accum_pass[render_pass_index], gpumat);
-        if (!use_diffuse && !use_glossy && !use_refract) {
-          /* Small hack to avoid issue when utilTex is needed for
-           * world_normals_get and none of the bsdfs that need it are present.
-           * This binds `utilTex` even if not needed. */
-          DRW_shgroup_uniform_texture(shgrp, "utilTex", e_data.util_tex);
-        }
+        RENDER_PASS_ITER_BEGIN (stl->g_data->render_passes, render_pass_index, render_pass_flag) {
+          shgrp = DRW_shgroup_material_hair_create(
+              ob, psys, md, psl->material_accum_pass[render_pass_index], gpumat);
+          if (!use_diffuse && !use_glossy && !use_refract) {
+            /* Small hack to avoid issue when utilTex is needed for
+             * world_normals_get and none of the bsdfs that need it are present.
+             * This binds `utilTex` even if not needed. */
+            DRW_shgroup_uniform_texture(shgrp, "utilTex", e_data.util_tex);
+          }
 
-        add_standard_uniforms(shgrp,
-                              sldata,
-                              vedata,
-                              &ssr_id,
-                              NULL,
-                              use_diffuse,
-                              use_glossy,
-                              use_refract,
-                              false,
-                              false,
-                              render_pass_flag);
-        RENDER_PASS_ITER_END(render_pass_index)
+          add_standard_uniforms(shgrp,
+                                sldata,
+                                vedata,
+                                &ssr_id,
+                                NULL,
+                                use_diffuse,
+                                use_glossy,
+                                use_refract,
+                                false,
+                                false,
+                                render_pass_flag);
+        }
+        RENDER_PASS_ITER_END(render_pass_index);
 
         break;
       }
@@ -1940,23 +1944,24 @@ static void eevee_hair_cache_populate(EEVEE_Data *vedata,
     DRW_shgroup_uniform_float(shgrp, "specular", spec_p, 1);
     DRW_shgroup_uniform_float(shgrp, "roughness", rough_p, 1);
 
-    RENDER_PASS_ITER_BEGIN(stl->g_data->render_passes, render_pass_index, render_pass_flag)
-    shgrp = EEVEE_default_hair_render_pass_shading_group_get(
-        sldata,
-        vedata,
-        ob,
-        psys,
-        md,
-        holdout,
-        use_ssr,
-        psl->material_accum_pass[render_pass_index],
-        render_pass_flag);
-
-    DRW_shgroup_uniform_vec3(shgrp, "basecol", color_p, 1);
-    DRW_shgroup_uniform_float(shgrp, "metallic", metal_p, 1);
-    DRW_shgroup_uniform_float(shgrp, "specular", spec_p, 1);
-    DRW_shgroup_uniform_float(shgrp, "roughness", rough_p, 1);
-    RENDER_PASS_ITER_END(render_pass_index)
+    RENDER_PASS_ITER_BEGIN (stl->g_data->render_passes, render_pass_index, render_pass_flag) {
+      shgrp = EEVEE_default_hair_render_pass_shading_group_get(
+          sldata,
+          vedata,
+          ob,
+          psys,
+          md,
+          holdout,
+          use_ssr,
+          psl->material_accum_pass[render_pass_index],
+          render_pass_flag);
+
+      DRW_shgroup_uniform_vec3(shgrp, "basecol", color_p, 1);
+      DRW_shgroup_uniform_float(shgrp, "metallic", metal_p, 1);
+      DRW_shgroup_uniform_float(shgrp, "specular", spec_p, 1);
+      DRW_shgroup_uniform_float(shgrp, "roughness", rough_p, 1);
+    }
+    RENDER_PASS_ITER_END(render_pass_index);
   }
 
   /* Shadows */
diff --git a/source/blender/draw/intern/draw_cache_impl_displist.c b/source/blender/draw/intern/draw_cache_impl_displist.c
index 04889463447..f1e5dbcc3cb 100644
--- a/source/blender/draw/intern/draw_cache_impl_displist.c
+++ b/source/blender/draw/intern/draw_cache_impl_displist.c
@@ -406,7 +406,7 @@ static void displist_vertbuf_attr_set_tri_pos_nor_uv(GPUVertBufRaw *pos_step,
   }
 }
 
-#define SURFACE_QUAD_ITER_START(dl) \
+#define SURFACE_QUAD_ITER_BEGIN(dl) \
   { \
     uint quad[4]; \
     int quad_index = 0; \
@@ -446,8 +446,7 @@ static void displist_surf_fnors_ensure(const DispList *dl, float (**fnors)[3])
   float(*nor_flat)[3] = MEM_mallocN(sizeof(float) * 3 * u_len * v_len, __func__);
   *fnors = nor_flat;
 
-  SURFACE_QUAD_ITER_START(dl)
-  {
+  SURFACE_QUAD_ITER_BEGIN (dl) {
     normal_quad_v3(*nor_flat, verts[quad[0]], verts[quad[1]], verts[quad[2]], verts[quad[3]]);
     nor_flat++;
   }
@@ -570,8 +569,7 @@ void DRW_displist_vertbuf_create_loop_pos_and_nor_and_uv_and_tan(ListBase *lb,
           BKE_displist_tangent_calc(dl, fnors, &tangents);
         }
 
-        SURF

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list