Cleanup: DRW: Remove uneeded _add suffix from DRW_shgroup_call_add

25 files changed, 166 insertions, 166 deletions

diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c
index 05ee485e053..360d1d30736 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -143,7 +143,7 @@ static void basic_cache_populate(void *vedata, Object *ob)
       const int draw_as = (part->draw_as == PART_DRAW_REND) ? part->ren_as : part->draw_as;
       if (draw_as == PART_DRAW_PATH) {
         struct GPUBatch *hairs = DRW_cache_particles_get_hair(ob, psys, NULL);
-        DRW_shgroup_call_add(stl->g_data->depth_shgrp, hairs, NULL);
+        DRW_shgroup_call(stl->g_data->depth_shgrp, hairs, NULL);
       }
     }
   }
@@ -159,7 +159,7 @@ static void basic_cache_populate(void *vedata, Object *ob)
     if (is_flat_object_viewed_from_side) {
       /* Avoid losing flat objects when in ortho views (see T56549) */
       struct GPUBatch *geom = DRW_cache_object_all_edges_get(ob);
-      DRW_shgroup_call_object_add(stl->g_data->depth_shgrp, geom, ob);
+      DRW_shgroup_call_object(stl->g_data->depth_shgrp, geom, ob);
       return;
     }
   }
@@ -169,7 +169,7 @@ static void basic_cache_populate(void *vedata, Object *ob)
     const bool do_cull = (draw_ctx->v3d &&
                           (draw_ctx->v3d->shading.flag & V3D_SHADING_BACKFACE_CULLING));
     /* Depth Prepass */
-    DRW_shgroup_call_object_add(
+    DRW_shgroup_call_object(
         (do_cull) ? stl->g_data->depth_shgrp_cull : stl->g_data->depth_shgrp, geom, ob);
   }
 }
diff --git a/source/blender/draw/engines/eevee/eevee_bloom.c b/source/blender/draw/engines/eevee/eevee_bloom.c
index b0013151a70..e0165ea020a 100644
--- a/source/blender/draw/engines/eevee/eevee_bloom.c
+++ b/source/blender/draw/engines/eevee/eevee_bloom.c
@@ -186,7 +186,7 @@ static DRWShadingGroup *eevee_create_bloom_pass(const char *name,
   *pass = DRW_pass_create(name, DRW_STATE_WRITE_COLOR);
 
   DRWShadingGroup *grp = DRW_shgroup_create(sh, *pass);
-  DRW_shgroup_call_add(grp, quad, NULL);
+  DRW_shgroup_call(grp, quad, NULL);
   DRW_shgroup_uniform_texture_ref(grp, "sourceBuffer", &effects->unf_source_buffer);
   DRW_shgroup_uniform_vec2(grp, "sourceBufferTexelSize", effects->unf_source_texel_size, 1);
   if (upsample) {
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
index f09be2324a6..3d058f7e46e 100644
--- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c
+++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c
@@ -212,7 +212,7 @@ void EEVEE_depth_of_field_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_
     DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &dtxl->depth);
     DRW_shgroup_uniform_vec2(grp, "nearFar", effects->dof_near_far, 1);
     DRW_shgroup_uniform_vec2(grp, "dofParams", effects->dof_params, 1);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
 
     psl->dof_scatter = DRW_pass_create("DoF Scatter",
                                        DRW_STATE_WRITE_COLOR | DRW_STATE_ADDITIVE_FULL);
@@ -228,7 +228,7 @@ void EEVEE_depth_of_field_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_
     DRW_shgroup_uniform_texture_ref(grp, "cocBuffer", &effects->dof_coc);
     DRW_shgroup_uniform_vec4(grp, "bokehParams", effects->dof_bokeh, 2);
 
-    DRW_shgroup_call_procedural_triangles_add(grp, sprite_len, NULL);
+    DRW_shgroup_call_procedural_triangles(grp, sprite_len, NULL);
 
     psl->dof_resolve = DRW_pass_create("DoF Resolve", DRW_STATE_WRITE_COLOR);
 
@@ -238,7 +238,7 @@ void EEVEE_depth_of_field_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_
     DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &dtxl->depth);
     DRW_shgroup_uniform_vec2(grp, "nearFar", effects->dof_near_far, 1);
     DRW_shgroup_uniform_vec2(grp, "dofParams", effects->dof_params, 1);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
 
     if (use_alpha) {
       DRW_shgroup_uniform_texture_ref(grp, "scatterAlphaBuffer", &effects->dof_blur_alpha);
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c
index b25573f89bc..c4075fc2bef 100644
--- a/source/blender/draw/engines/eevee/eevee_effects.c
+++ b/source/blender/draw/engines/eevee/eevee_effects.c
@@ -301,7 +301,7 @@ void EEVEE_effects_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRWShadingGroup *grp = DRW_shgroup_create(e_data.downsample_sh, psl->color_downsample_ps);
     DRW_shgroup_uniform_texture_ref(grp, "source", &e_data.color_src);
     DRW_shgroup_uniform_float(grp, "fireflyFactor", &sldata->common_data.ssr_firefly_fac, 1);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
 
   {
@@ -311,7 +311,7 @@ void EEVEE_effects_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_texture_ref(grp, "source", &e_data.color_src);
     DRW_shgroup_uniform_float(grp, "texelSize", &e_data.cube_texel_size, 1);
     DRW_shgroup_uniform_int_copy(grp, "Layer", 0);
-    DRW_shgroup_call_instances_add(grp, quad, NULL, 6);
+    DRW_shgroup_call_instances(grp, quad, NULL, 6);
   }
 
   {
@@ -322,7 +322,7 @@ void EEVEE_effects_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
                                              downsample_write | DRW_STATE_DEPTH_ALWAYS);
     grp = DRW_shgroup_create(e_data.maxz_downlevel_sh, psl->maxz_downlevel_ps);
     DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &txl->maxzbuffer);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
 
     /* Copy depth buffer to halfres top level of HiZ */
 
@@ -330,27 +330,27 @@ void EEVEE_effects_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
                                              downsample_write | DRW_STATE_DEPTH_ALWAYS);
     grp = DRW_shgroup_create(e_data.maxz_downdepth_sh, psl->maxz_downdepth_ps);
     DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &e_data.depth_src);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
 
     psl->maxz_downdepth_layer_ps = DRW_pass_create("HiZ Max Copy DepthLayer Halfres",
                                                    downsample_write | DRW_STATE_DEPTH_ALWAYS);
     grp = DRW_shgroup_create(e_data.maxz_downdepth_layer_sh, psl->maxz_downdepth_layer_ps);
     DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &e_data.depth_src);
     DRW_shgroup_uniform_int(grp, "depthLayer", &e_data.depth_src_layer, 1);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
 
     psl->maxz_copydepth_ps = DRW_pass_create("HiZ Max Copy Depth Fullres",
                                              downsample_write | DRW_STATE_DEPTH_ALWAYS);
     grp = DRW_shgroup_create(e_data.maxz_copydepth_sh, psl->maxz_copydepth_ps);
     DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &e_data.depth_src);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
 
     psl->maxz_copydepth_layer_ps = DRW_pass_create("HiZ Max Copy DepthLayer Halfres",
                                                    downsample_write | DRW_STATE_DEPTH_ALWAYS);
     grp = DRW_shgroup_create(e_data.maxz_copydepth_layer_sh, psl->maxz_copydepth_layer_ps);
     DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &e_data.depth_src);
     DRW_shgroup_uniform_int(grp, "depthLayer", &e_data.depth_src_layer, 1);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
 
   if ((effects->enabled_effects & EFFECT_VELOCITY_BUFFER) != 0) {
@@ -362,7 +362,7 @@ void EEVEE_effects_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
     DRW_shgroup_uniform_mat4(grp, "currPersinv", effects->velocity_curr_persinv);
     DRW_shgroup_uniform_mat4(grp, "pastPersmat", effects->velocity_past_persmat);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
 
   if ((effects->enabled_effects & EFFECT_ALPHA_CHECKER) != 0) {
@@ -379,7 +379,7 @@ void EEVEE_effects_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_vec4(grp, "color1", effects->color_checker_dark, 1);
     DRW_shgroup_uniform_vec4(grp, "color2", effects->color_checker_light, 1);
     DRW_shgroup_uniform_int_copy(grp, "size", 8);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
 }
 
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index a45a29ce9cb..2dd5debfb83 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -249,7 +249,7 @@ void EEVEE_lightbake_cache_init(EEVEE_ViewLayerData *sldata,
     DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 
     struct GPUBatch *geom = DRW_cache_fullscreen_quad_get();
-    DRW_shgroup_call_add(grp, geom, NULL);
+    DRW_shgroup_call(grp, geom, NULL);
   }
 
   {
@@ -272,7 +272,7 @@ void EEVEE_lightbake_cache_init(EEVEE_ViewLayerData *sldata,
     DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 
     struct GPUBatch *geom = DRW_cache_fullscreen_quad_get();
-    DRW_shgroup_call_add(grp, geom, NULL);
+    DRW_shgroup_call(grp, geom, NULL);
   }
 
   {
@@ -294,7 +294,7 @@ void EEVEE_lightbake_cache_init(EEVEE_ViewLayerData *sldata,
     DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 
     struct GPUBatch *geom = DRW_cache_fullscreen_quad_get();
-    DRW_shgroup_call_add(grp, geom, NULL);
+    DRW_shgroup_call(grp, geom, NULL);
   }
 
   {
@@ -306,7 +306,7 @@ void EEVEE_lightbake_cache_init(EEVEE_ViewLayerData *sldata,
     DRW_shgroup_uniform_texture_ref(grp, "irradianceGrid", &light_cache->grid_tx.tex);
 
     struct GPUBatch *geom = DRW_cache_fullscreen_quad_get();
-    DRW_shgroup_call_add(grp, geom, NULL);
+    DRW_shgroup_call(grp, geom, NULL);
   }
 }
 
@@ -360,7 +360,7 @@ void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat
             DRW_shgroup_uniform_block(grp, "planar_block", sldata->planar_ubo);
             DRW_shgroup_uniform_block(grp, "light_block", sldata->light_ubo);
             DRW_shgroup_uniform_block(grp, "shadow_block", sldata->shadow_ubo);
-            DRW_shgroup_call_add(grp, geom, NULL);
+            DRW_shgroup_call(grp, geom, NULL);
             break;
           default:
             col = error_col;
@@ -374,7 +374,7 @@ void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat
       grp = DRW_shgroup_create(EEVEE_shaders_probe_default_sh_get(), psl->probe_background);
       DRW_shgroup_uniform_vec3(grp, "color", col, 1);
       DRW_shgroup_uniform_float_copy(grp, "backgroundAlpha", 1.0f);
-      DRW_shgroup_call_add(grp, geom, NULL);
+      DRW_shgroup_call(grp, geom, NULL);
     }
   }
 
@@ -399,7 +399,7 @@ void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat
       DRW_shgroup_uniform_block(grp, "planar_block", sldata->planar_ubo);
       DRW_shgroup_uniform_block(grp, "grid_block", sldata->grid_ubo);
 
-      DRW_shgroup_call_procedural_triangles_add(grp, cube_len * 2, NULL);
+      DRW_shgroup_call_procedural_triangles(grp, cube_len * 2, NULL);
     }
 
     /* Grid Display */
@@ -425,7 +425,7 @@ void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat
         DRW_shgroup_uniform_block(shgrp, "grid_block", sldata->grid_ubo);
         DRW_shgroup_uniform_block(shgrp, "common_block", sldata->common_ubo);
         int tri_count = egrid->resolution[0] * egrid->resolution[1] * egrid->resolution[2] * 2;
-        DRW_shgroup_call_procedural_triangles_add(shgrp, tri_count, NULL);
+        DRW_shgroup_call_procedural_triangles(shgrp, tri_count, NULL);
       }
     }
 
@@ -440,7 +440,7 @@ void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat
                                               psl->probe_display);
     DRW_shgroup_uniform_texture_ref(grp, "probePlanars", &txl->planar_pool);
 
-    stl->g_data->planar_display_shgrp = DRW_shgroup_call_buffer_instance_add(
+    stl->g_data->planar_display_shgrp = DRW_shgroup_call_buffer_instance(
         grp, e_data.format_probe_display_planar, DRW_cache_quad_get());
   }
   else {
@@ -773,7 +773,7 @@ void EEVEE_lightprobes_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved
 
     DRW_shgroup_uniform_texture_ref(grp, "source", &txl->planar_pool);
     DRW_shgroup_uniform_float(grp, "fireflyFactor", &sldata->common_data.ssr_firefly_fac, 1);
-    DRW_shgroup_call_procedural_triangles_add(grp, pinfo->num_planar, NULL);
+    DRW_shgroup_call_procedural_triangles(grp, pinfo->num_planar, NULL);
   }
 }
 
diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c
index 0e24115f849..730372bce9c 100644
--- a/source/blender/draw/engines/eevee/eevee_lights.c
+++ b/source/blender/draw/engines/eevee/eevee_lights.c
@@ -263,7 +263,7 @@ static DRWPass *eevee_lights_cube_store_pass_get(EEVEE_PassList *psl,
     DRW_shgroup_uniform_texture_ref(grp, "shadowTexture", &sldata->shadow_cube_blur);
     DRW_shgroup_uniform_block(grp, "shadow_render_block", sldata->shadow_render_ubo);
     DRW_shgroup_uniform_float(grp, "shadowFilterSize", &linfo->filter_size, 1);
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   }
   return *pass;
 }
@@ -285,7 +285,7 @@ static DRWPass *eevee_lights_cascade_store_pass_get(EEVEE_PassList *psl,
     DRW_shgroup_uniform_block(grp, "shadow_render_block", sldata->shadow_render_ubo);
     DRW_shgroup_uniform_int(grp, "cascadeId", &linfo->current_shadow_cascade, 1);
     DRW_shgroup_uniform_float(grp, "shadowFilterSize", &linfo->filter_size, 1);
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   }
   return *pass;
 }
@@ -327,7 +327,7 @@ void EEVEE_lights_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_block(grp, "shadow_render_block", sldata->shadow_render_ubo);
     DRW_shgroup_uniform_float(grp, "shadowFilterSize", &linfo->filter_size, 1);
     DRW_shgroup_uniform_int(grp, "faceId", &linfo->current_shadow_face, 1);
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   }
 
   {
@@ -340,7 +340,7 @@ void EEVEE_lights_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_block(grp, "shadow_render_block", sldata->shadow_render_ubo);
     DRW_shgroup_uniform_float(grp, "shadowFilterSize", &linfo->filter_size, 1);
     DRW_shgroup_uniform_int(grp, "cascadeId", &linfo->current_shadow_cascade, 1);
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   }
 
   {
@@ -454,7 +454,7 @@ void EEVEE_lights_cache_shcaster_add(EEVEE_ViewLayerData *UNUSED(sldata),
                                      struct GPUBatch *geom,
                                      Object *ob)
 {
-  DRW_shgroup_call_object_add(stl->g_data->shadow_shgrp, geom, ob);
+  DRW_shgroup_call_object(stl->g_data->shadow_shgrp, geom, ob);
 }
 
 void EEVEE_lights_cache_shcaster_material_add(EEVEE_ViewLayerData *sldata,
@@ -484,7 +484,7 @@ void EEVEE_lights_cache_shcaster_material_add(EEVEE_ViewLayerData *sldata,
     DRW_shgroup_uniform_float(grp, "alphaThreshold", alpha_threshold, 1);
   }
 
-  DRW_shgroup_call_object_add(grp, geom, ob);
+  DRW_shgroup_call_object(grp, geom, ob);
 }
 
 /* Make that object update shadow casting lights inside its influence bounding box. */
diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c
index 2ca60861995..bd786c06e69 100644
--- a/source/blender/draw/engines/eevee/eevee_lookdev.c
+++ b/source/blender/draw/engines/eevee/eevee_lookdev.c
@@ -151,7 +151,7 @@ void EEVEE_lookdev_cache_init(EEVEE_Data *vedata,
       DRW_shgroup_uniform_mat3(*grp, "StudioLightMatrix", stl->g_data->studiolight_matrix);
       DRW_shgroup_uniform_float_copy(*grp, "backgroundAlpha", background_alpha);
       DRW_shgroup_uniform_vec3(*grp, "color", background_color, 1);
-      DRW_shgroup_call_add(*grp, geom, NULL);
+      DRW_shgroup_call(*grp, geom, NULL);
       if (!pinfo) {
         /* Do not fadeout when doing probe rendering, only when drawing the background */
         DRW_shgroup_uniform_float(
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 541511d2439..3f6cc306c97 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -134,7 +134,7 @@ static struct GPUTexture *create_ggx_lut_texture(int UNUSED(w), int UNUSED(h))
   DRW_shgroup_uniform_texture(grp, "texJitter", e_data.jitter);
 
   struct GPUBatch *geom = DRW_cache_fullscreen_quad_get();
-  DRW_shgroup_call_add(grp, geom, NULL);
+  DRW_shgroup_call(grp, geom, NULL);
 
   float *texels = MEM_mallocN(sizeof(float[2]) * w * h, "lut");
 
@@ -197,7 +197,7 @@ static struct GPUTexture *create_ggx_refraction_lut_texture(int w, int h)
   DRW_shgroup_uniform_texture(grp, "utilTex", e_data.util_tex);
 
   struct GPUBatch *geom = DRW_cache_fullscreen_quad_get();
-  DRW_shgroup_call_add(grp, geom, NULL);
+  DRW_shgroup_call(grp, geom, NULL);
 
   float *texels = MEM_mallocN(sizeof(float[2]) * w * h, "lut");
 
@@ -1035,7 +1035,7 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
             DRW_shgroup_uniform_block(grp, "planar_block", sldata->planar_ubo);
             DRW_shgroup_uniform_block(grp, "light_block", sldata->light_ubo);
             DRW_shgroup_uniform_block(grp, "shadow_block", sldata->shadow_ubo);
-            DRW_shgroup_call_add(grp, geom, NULL);
+            DRW_shgroup_call(grp, geom, NULL);
             break;
           case GPU_MAT_QUEUED:
             /* TODO Bypass probe compilation. */
@@ -1054,7 +1054,7 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
       grp = DRW_shgroup_create(e_data.default_background, psl->background_pass);
       DRW_shgroup_uniform_vec3(grp, "color", col, 1);
       DRW_shgroup_uniform_float(grp, "backgroundAlpha", &stl->g_data->background_alpha, 1);
-      DRW_shgroup_call_add(grp, geom, NULL);
+      DRW_shgroup_call(grp, geom, NULL);
     }
   }
 
@@ -1143,7 +1143,7 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRWShadingGroup *grp = DRW_shgroup_create(e_data.update_noise_sh, psl->update_noise_pass);
     DRW_shgroup_uniform_texture(grp, "blueNoise", e_data.noise_tex);
     DRW_shgroup_uniform_vec3(grp, "offsets", e_data.noise_offsets, 1);
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   }
 
   if (LOOK_DEV_OVERLAY_ENABLED(draw_ctx->v3d)) {
@@ -1168,7 +1168,7 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_float_copy(shgrp, "metallic", 0.0f);
     DRW_shgroup_uniform_float_copy(shgrp, "specular", 0.5f);
     DRW_shgroup_uniform_float_copy(shgrp, "roughness", 1.0f);
-    DRW_shgroup_call_add(shgrp, sphere, NULL);
+    DRW_shgroup_call(shgrp, sphere, NULL);
 
     psl->lookdev_glossy_pass = DRW_pass_create("LookDev Glossy Pass", state);
     shgrp = DRW_shgroup_create(e_data.default_lit[options], psl->lookdev_glossy_pass);
@@ -1176,18 +1176,18 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_vec3(shgrp, "basecol", color_chrome, 1);
     DRW_shgroup_uniform_float_copy(shgrp, "metallic", 1.0f);
     DRW_shgroup_uniform_float_copy(shgrp, "roughness", 0.0f);
-    DRW_shgroup_call_add(shgrp, sphere, NULL);
+    DRW_shgroup_call(shgrp, sphere, NULL);
   }
 }
 
 #define ADD_SHGROUP_CALL(shgrp, ob, geom, oedata) \
   do { \
     if (oedata) { \
-      DRW_shgroup_call_object_add_with_callback( \
+      DRW_shgroup_call_object_with_callback( \
           shgrp, geom, ob, EEVEE_lightprobes_obj_visibility_cb, oedata); \
     } \
     else { \
-      DRW_shgroup_call_object_add_ex(shgrp, geom, ob, false); \
+      DRW_shgroup_call_object_ex(shgrp, geom, ob, false); \
     } \
   } while (0)
 
@@ -1691,9 +1691,9 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata,
       if (is_sculpt_mode) {
         /* Vcol is not supported in the modes that require PBVH drawing. */
         bool use_vcol = false;
-        DRW_shgroup_call_sculpt_with_materials_add(shgrp_array, ob, use_vcol);
-        DRW_shgroup_call_sculpt_with_materials_add(shgrp_depth_array, ob, use_vcol);
-        DRW_shgroup_call_sculpt_with_materials_add(shgrp_depth_clip_array, ob, use_vcol);
+        DRW_shgroup_call_sculpt_with_materials(shgrp_array, ob, use_vcol);
+        DRW_shgroup_call_sculpt_with_materials(shgrp_depth_array, ob, use_vcol);
+        DRW_shgroup_call_sculpt_with_materials(shgrp_depth_clip_array, ob, use_vcol);
         /* TODO(fclem): Support shadows in sculpt mode. */
       }
       else if (mat_geom) {
diff --git a/source/blender/draw/engines/eevee/eevee_mist.c b/source/blender/draw/engines/eevee/eevee_mist.c
index 1ea1e086aea..d8127d7ea1f 100644
--- a/source/blender/draw/engines/eevee/eevee_mist.c
+++ b/source/blender/draw/engines/eevee/eevee_mist.c
@@ -111,7 +111,7 @@ void EEVEE_mist_output_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
   DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &dtxl->depth);
   DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
   DRW_shgroup_uniform_vec3(grp, "mistSettings", &g_data->mist_start, 1);
-  DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+  DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
 }
 
 void EEVEE_mist_output_accumulate(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c
index f8795a7ff0e..f38252590d8 100644
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.c
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c
@@ -203,7 +203,7 @@ void EEVEE_motion_blur_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Dat
     DRW_shgroup_uniform_mat4(grp, "pastViewProjMatrix", effects->past_world_to_ndc);
     DRW_shgroup_uniform_texture_ref(grp, "colorBuffer", &effects->source_buffer);
     DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &dtxl->depth);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
 }
 
diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.c b/source/blender/draw/engines/eevee/eevee_occlusion.c
index 822df19f899..577d7125641 100644
--- a/source/blender/draw/engines/eevee/eevee_occlusion.c
+++ b/source/blender/draw/engines/eevee/eevee_occlusion.c
@@ -159,7 +159,7 @@ void EEVEE_occlusion_output_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata
     DRW_shgroup_uniform_texture_ref(grp, "normalBuffer", &effects->ssr_normal_input);
     DRW_shgroup_uniform_texture_ref(grp, "horizonBuffer", &effects->gtao_horizons);
     DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   }
   else {
     /* Cleanup to release memory */
@@ -196,7 +196,7 @@ void EEVEE_occlusion_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_texture_ref(grp, "maxzBuffer", &txl->maxzbuffer);
     DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &effects->ao_src_depth);
     DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
 
     psl->ao_horizon_search_layer = DRW_pass_create("GTAO Horizon Search Layer",
                                                    DRW_STATE_WRITE_COLOR);
@@ -206,7 +206,7 @@ void EEVEE_occlusion_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_texture_ref(grp, "depthBufferLayered", &effects->ao_src_depth);
     DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
     DRW_shgroup_uniform_int(grp, "layer", &stl->effects->ao_depth_layer, 1);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
 
     if (G.debug_value == 6) {
       psl->ao_horizon_debug = DRW_pass_create("GTAO Horizon Debug", DRW_STATE_WRITE_COLOR);
@@ -217,7 +217,7 @@ void EEVEE_occlusion_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
       DRW_shgroup_uniform_texture_ref(grp, "normalBuffer", &effects->ssr_normal_input);
       DRW_shgroup_uniform_texture_ref(grp, "horizonBuffer", &effects->gtao_horizons);
       DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
-      DRW_shgroup_call_add(grp, quad, NULL);
+      DRW_shgroup_call(grp, quad, NULL);
     }
   }
 }
diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
index 22c7dd00b97..ed69c5f4727 100644
--- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
+++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
@@ -230,7 +230,7 @@ void EEVEE_screen_raytrace_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *v
     if (!effects->reflection_trace_full) {
       DRW_shgroup_uniform_ivec2(grp, "halfresOffset", effects->ssr_halfres_ofs, 1);
     }
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
 
     psl->ssr_resolve = DRW_pass_create("SSR Resolve", DRW_STATE_WRITE_COLOR | DRW_STATE_ADDITIVE);
     grp = DRW_shgroup_create(resolve_shader, psl->ssr_resolve);
@@ -253,7 +253,7 @@ void EEVEE_screen_raytrace_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *v
       DRW_shgroup_uniform_texture_ref(grp, "horizonBuffer", &effects->gtao_horizons);
     }
 
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
 }
 
diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c
index cbe0f474ac7..592de2b2389 100644
--- a/source/blender/draw/engines/eevee/eevee_subsurface.c
+++ b/source/blender/draw/engines/eevee/eevee_subsurface.c
@@ -229,7 +229,7 @@ void EEVEE_subsurface_add_pass(EEVEE_ViewLayerData *sldata,
   DRW_shgroup_uniform_block(grp, "sssProfile", sss_profile);
   DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
   DRW_shgroup_stencil_mask(grp, sss_id);
-  DRW_shgroup_call_add(grp, quad, NULL);
+  DRW_shgroup_call(grp, quad, NULL);
 
   struct GPUShader *sh = (effects->sss_separate_albedo) ? e_data.sss_sh[2] : e_data.sss_sh[1];
   grp = DRW_shgroup_create(sh, psl->sss_resolve_ps);
@@ -239,7 +239,7 @@ void EEVEE_subsurface_add_pass(EEVEE_ViewLayerData *sldata,
   DRW_shgroup_uniform_block(grp, "sssProfile", sss_profile);
   DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
   DRW_shgroup_stencil_mask(grp, sss_id);
-  DRW_shgroup_call_add(grp, quad, NULL);
+  DRW_shgroup_call(grp, quad, NULL);
 
   if (effects->sss_separate_albedo) {
     DRW_shgroup_uniform_texture_ref(grp, "sssAlbedo", &effects->sss_albedo);
@@ -253,7 +253,7 @@ void EEVEE_subsurface_add_pass(EEVEE_ViewLayerData *sldata,
     DRW_shgroup_uniform_block(grp, "sssProfile", sss_profile);
     DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
     DRW_shgroup_stencil_mask(grp, sss_id);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
 
     if (effects->sss_separate_albedo) {
       DRW_shgroup_uniform_texture_ref(grp, "sssAlbedo", &effects->sss_albedo);
diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index 194fff9b93c..1b7adba4284 100644
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@ -287,7 +287,7 @@ void EEVEE_temporal_sampling_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data
     else {
       DRW_shgroup_uniform_float(grp, "alpha", &effects->taa_alpha, 1);
     }
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   }
 }
 
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index 8e4a2da7743..8867bf107ec 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -416,7 +416,7 @@ void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
         DRW_shgroup_uniform_texture(grp, "sampflame", e_data.dummy_flame);
         DRW_shgroup_uniform_vec2(grp, "unftemperature", (float[2]){0.0f, 1.0f}, 1);
 
-        DRW_shgroup_call_procedural_triangles_add(grp, common_data->vol_tex_size[2], NULL);
+        DRW_shgroup_call_procedural_triangles(grp, common_data->vol_tex_size[2], NULL);
       }
     }
 
@@ -426,7 +426,7 @@ void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 
       DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 
-      DRW_shgroup_call_procedural_triangles_add(grp, common_data->vol_tex_size[2], NULL);
+      DRW_shgroup_call_procedural_triangles(grp, common_data->vol_tex_size[2], NULL);
     }
 
     /* Volumetric Objects */
@@ -452,7 +452,7 @@ void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_block(grp, "shadow_block", sldata->shadow_ubo);
     DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 
-    DRW_shgroup_call_procedural_triangles_add(grp, common_data->vol_tex_size[2], NULL);
+    DRW_shgroup_call_procedural_triangles(grp, common_data->vol_tex_size[2], NULL);
 
     psl->volumetric_integration_ps = DRW_pass_create("Volumetric Integration",
                                                      DRW_STATE_WRITE_COLOR);
@@ -461,7 +461,7 @@ void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_texture_ref(grp, "volumeExtinction", &txl->volume_transmittance);
     DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 
-    DRW_shgroup_call_procedural_triangles_add(grp, common_data->vol_tex_size[2], NULL);
+    DRW_shgroup_call_procedural_triangles(grp, common_data->vol_tex_size[2], NULL);
 
     psl->volumetric_resolve_ps = DRW_pass_create("Volumetric Resolve", DRW_STATE_WRITE_COLOR);
     grp = DRW_shgroup_create(e_data.volumetric_resolve_sh, psl->volumetric_resolve_ps);
@@ -470,7 +470,7 @@ void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
     DRW_shgroup_uniform_texture_ref(grp, "inSceneColor", &e_data.color_src);
     DRW_shgroup_uniform_texture_ref(grp, "inSceneDepth", &e_data.depth_src);
     DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   }
 }
 
@@ -580,7 +580,7 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata,
 
   /* TODO Reduce to number of slices intersecting. */
   /* TODO Preemptive culling. */
-  DRW_shgroup_call_procedural_triangles_add(grp, sldata->common_data.vol_tex_size[2], NULL);
+  DRW_shgroup_call_procedural_triangles(grp, sldata->common_data.vol_tex_size[2], NULL);
 }
 
 void EEVEE_volumes_compute(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c
index ed8c609c01f..643f51facd4 100644
--- a/source/blender/draw/engines/external/external_engine.c
+++ b/source/blender/draw/engines/external/external_engine.c
@@ -191,7 +191,7 @@ static void external_cache_populate(void *vedata, Object *ob)
     struct GPUBatch *geom = DRW_cache_object_surface_get(ob);
     if (geom) {
       /* Depth Prepass */
-      DRW_shgroup_call_add(stl->g_data->depth_shgrp, geom, ob->obmat);
+      DRW_shgroup_call(stl->g_data->depth_shgrp, geom, ob->obmat);
     }
   }
 }
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index d57c43ab375..70fb6b57d42 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1544,9 +1544,9 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data,
         }
 
         /* buffer strokes, must show stroke always */
-        DRW_shgroup_call_add(stl->g_data->shgrps_drawing_stroke,
-                             e_data->batch_buffer_stroke,
-                             stl->storage->unit_matrix);
+        DRW_shgroup_call(stl->g_data->shgrps_drawing_stroke,
+                         e_data->batch_buffer_stroke,
+                         stl->storage->unit_matrix);
 
         if ((gpd->runtime.sbuffer_size >= 3) &&
             (gpd->runtime.sfill[3] > GPENCIL_ALPHA_OPACITY_THRESH) &&
@@ -1568,9 +1568,9 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data,
           }
 
           e_data->batch_buffer_fill = DRW_gpencil_get_buffer_fill_geom(gpd);
-          DRW_shgroup_call_add(stl->g_data->shgrps_drawing_fill,
-                               e_data->batch_buffer_fill,
-                               stl->storage->unit_matrix);
+          DRW_shgroup_call(stl->g_data->shgrps_drawing_fill,
+                           e_data->batch_buffer_fill,
+                           stl->storage->unit_matrix);
           stl->storage->buffer_fill = true;
         }
         stl->storage->buffer_stroke = true;
@@ -1600,7 +1600,7 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data,
 
     e_data->batch_buffer_ctrlpoint = DRW_gpencil_get_buffer_ctrlpoint_geom(gpd);
 
-    DRW_shgroup_call_add(shgrp, e_data->batch_buffer_ctrlpoint, stl->storage->unit_matrix);
+    DRW_shgroup_call(shgrp, e_data->batch_buffer_ctrlpoint, stl->storage->unit_matrix);
 
     stl->storage->buffer_ctrlpoint = true;
   }
@@ -1722,12 +1722,12 @@ static void DRW_gpencil_shgroups_create(GPENCIL_e_data *e_data,
                                                   scale,
                                                   cache_ob->shading_type);
         if ((do_onion) || (elm->onion == false)) {
-          DRW_shgroup_call_range_add(shgrp,
-                                     cache->b_stroke.batch,
-                                     (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix :
-                                                              cache_ob->obmat,
-                                     start_stroke,
-                                     len);
+          DRW_shgroup_call_range(shgrp,
+                                 cache->b_stroke.batch,
+                                 (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix :
+                                                          cache_ob->obmat,
+                                 start_stroke,
+                                 len);
         }
         stl->storage->shgroup_id++;
         start_stroke = elm->vertex_idx;
@@ -1751,12 +1751,12 @@ static void DRW_gpencil_shgroups_create(GPENCIL_e_data *e_data,
                                                  cache_ob->shading_type);
 
         if ((do_onion) || (elm->onion == false)) {
-          DRW_shgroup_call_range_add(shgrp,
-                                     cache->b_point.batch,
-                                     (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix :
-                                                              cache_ob->obmat,
-                                     start_point,
-                                     len);
+          DRW_shgroup_call_range(shgrp,
+                                 cache->b_point.batch,
+                                 (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix :
+                                                          cache_ob->obmat,
+                                 start_point,
+                                 len);
         }
         stl->storage->shgroup_id++;
         start_point = elm->vertex_idx;
@@ -1777,12 +1777,12 @@ static void DRW_gpencil_shgroups_create(GPENCIL_e_data *e_data,
                                                 cache_ob->shading_type);
 
         if ((do_onion) || (elm->onion == false)) {
-          DRW_shgroup_call_range_add(shgrp,
-                                     cache->b_fill.batch,
-                                     (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix :
-                                                              cache_ob->obmat,
-                                     start_fill,
-                                     len);
+          DRW_shgroup_call_range(shgrp,
+                                 cache->b_fill.batch,
+                                 (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix :
+                                                          cache_ob->obmat,
+                                 start_fill,
+                                 len);
         }
         stl->storage->shgroup_id++;
         start_fill = elm->vertex_idx;
@@ -1792,12 +1792,12 @@ static void DRW_gpencil_shgroups_create(GPENCIL_e_data *e_data,
         if (stl->g_data->shgrps_edit_point) {
           const int len = elm->vertex_idx - start_edit;
           /* use always the same group */
-          DRW_shgroup_call_range_add(stl->g_data->shgrps_edit_point,
-                                     cache->b_edit.batch,
-                                     (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix :
-                                                              cache_ob->obmat,
-                                     start_edit,
-                                     len);
+          DRW_shgroup_call_range(stl->g_data->shgrps_edit_point,
+                                 cache->b_edit.batch,
+                                 (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix :
+                                                          cache_ob->obmat,
+                                 start_edit,
+                                 len);
 
           start_edit = elm->vertex_idx;
         }
@@ -1807,12 +1807,12 @@ static void DRW_gpencil_shgroups_create(GPENCIL_e_data *e_data,
         if (stl->g_data->shgrps_edit_line) {
           const int len = elm->vertex_idx - start_edlin;
           /* use always the same group */
-          DRW_shgroup_call_range_add(stl->g_data->shgrps_edit_line,
-                                     cache->b_edlin.batch,
-                                     (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix :
-                                                              cache_ob->obmat,
-                                     start_edlin,
-                                     len);
+          DRW_shgroup_call_range(stl->g_data->shgrps_edit_line,
+                                 cache->b_edlin.batch,
+                                 (!cache_ob->is_dup_ob) ? gpf->runtime.viewmatrix :
+                                                          cache_ob->obmat,
+                                 start_edlin,
+                                 len);
 
           start_edlin = elm->vertex_idx;
         }
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 33f682b7f63..280702020df 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -462,7 +462,7 @@ void GPENCIL_cache_init(void *vedata)
                                     DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND |
                                         DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS);
     DRWShadingGroup *mix_shgrp = DRW_shgroup_create(e_data.gpencil_fullscreen_sh, psl->mix_pass);
-    DRW_shgroup_call_add(mix_shgrp, quad, NULL);
+    DRW_shgroup_call(mix_shgrp, quad, NULL);
     DRW_shgroup_uniform_texture_ref(mix_shgrp, "strokeColor", &e_data.input_color_tx);
     DRW_shgroup_uniform_texture_ref(mix_shgrp, "strokeDepth", &e_data.input_depth_tx);
     DRW_shgroup_uniform_int(mix_shgrp, "tonemapping", &stl->storage->tonemapping, 1);
@@ -480,7 +480,7 @@ void GPENCIL_cache_init(void *vedata)
                                                 DRW_STATE_DEPTH_LESS);
     DRWShadingGroup *mix_shgrp_noblend = DRW_shgroup_create(e_data.gpencil_fullscreen_sh,
                                                             psl->mix_pass_noblend);
-    DRW_shgroup_call_add(mix_shgrp_noblend, quad, NULL);
+    DRW_shgroup_call(mix_shgrp_noblend, quad, NULL);
     DRW_shgroup_uniform_texture_ref(mix_shgrp_noblend, "strokeColor", &e_data.input_color_tx);
     DRW_shgroup_uniform_texture_ref(mix_shgrp_noblend, "strokeDepth", &e_data.input_depth_tx);
     DRW_shgroup_uniform_int(mix_shgrp_noblend, "tonemapping", &stl->storage->tonemapping, 1);
@@ -498,7 +498,7 @@ void GPENCIL_cache_init(void *vedata)
                                                DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS);
     DRWShadingGroup *background_shgrp = DRW_shgroup_create(e_data.gpencil_background_sh,
                                                            psl->background_pass);
-    DRW_shgroup_call_add(background_shgrp, quad, NULL);
+    DRW_shgroup_call(background_shgrp, quad, NULL);
     DRW_shgroup_uniform_texture_ref(background_shgrp, "strokeColor", &e_data.background_color_tx);
     DRW_shgroup_uniform_texture_ref(background_shgrp, "strokeDepth", &e_data.background_depth_tx);
 
@@ -511,7 +511,7 @@ void GPENCIL_cache_init(void *vedata)
       psl->paper_pass = DRW_pass_create("GPencil Paper Pass",
                                         DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND);
       DRWShadingGroup *paper_shgrp = DRW_shgroup_create(e_data.gpencil_paper_sh, psl->paper_pass);
-      DRW_shgroup_call_add(paper_shgrp, quad, NULL);
+      DRW_shgroup_call(paper_shgrp, quad, NULL);
       DRW_shgroup_uniform_vec3(paper_shgrp, "color", v3d->shading.background_color, 1);
       DRW_shgroup_uniform_float(paper_shgrp, "opacity", &v3d->overlay.gpencil_paper_opacity, 1);
     }
@@ -530,7 +530,7 @@ void GPENCIL_cache_init(void *vedata)
                                           DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_LESS);
     DRWShadingGroup *blend_shgrp = DRW_shgroup_create(e_data.gpencil_blend_fullscreen_sh,
                                                       psl->blend_pass);
-    DRW_shgroup_call_add(blend_shgrp, quad, NULL);
+    DRW_shgroup_call(blend_shgrp, quad, NULL);
     DRW_shgroup_uniform_texture_ref(blend_shgrp, "strokeColor", &e_data.temp_color_tx_a);
     DRW_shgroup_uniform_texture_ref(blend_shgrp, "strokeDepth", &e_data.temp_depth_tx_a);
     DRW_shgroup_uniform_texture_ref(blend_shgrp, "blendColor", &e_data.temp_color_tx_fx);
@@ -682,7 +682,7 @@ void GPENCIL_cache_populate(void *vedata, Object *ob)
         copy_v3_v3(stl->storage->grid_matrix[3], ob->obmat[3]);
       }
 
-      DRW_shgroup_call_add(stl->g_data->shgrps_grid, e_data.batch_grid, stl->storage->grid_matrix);
+      DRW_shgroup_call(stl->g_data->shgrps_grid, e_data.batch_grid, stl->storage->grid_matrix);
     }
   }
 }
diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
index 355235618f6..ccb79ea2b93 100644
--- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c
@@ -210,7 +210,7 @@ static void DRW_gpencil_fx_blur(ShaderFxData *fx,
   GPUBatch *fxquad = DRW_cache_fullscreen_quad_get();
 
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_blur_sh, psl->fx_shader_pass_blend);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
   DRW_shgroup_uniform_vec2(fx_shgrp, "Viewport", DRW_viewport_size_get(), 1);
@@ -235,7 +235,7 @@ static void DRW_gpencil_fx_colorize(ShaderFxData *fx, GPENCIL_e_data *e_data, GP
 
   GPUBatch *fxquad = DRW_cache_fullscreen_quad_get();
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_colorize_sh, psl->fx_shader_pass);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
   DRW_shgroup_uniform_vec4(fx_shgrp, "low_color", &fxd->low_color[0], 1);
@@ -267,7 +267,7 @@ static void DRW_gpencil_fx_flip(ShaderFxData *fx, GPENCIL_e_data *e_data, GPENCI
 
   GPUBatch *fxquad = DRW_cache_fullscreen_quad_get();
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_flip_sh, psl->fx_shader_pass);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
   DRW_shgroup_uniform_int(fx_shgrp, "flipmode", &fxd->flipmode, 1);
@@ -297,7 +297,7 @@ static void DRW_gpencil_fx_light(ShaderFxData *fx,
 
   GPUBatch *fxquad = DRW_cache_fullscreen_quad_get();
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_light_sh, psl->fx_shader_pass);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
 
@@ -352,7 +352,7 @@ static void DRW_gpencil_fx_pixel(ShaderFxData *fx,
 
   GPUBatch *fxquad = DRW_cache_fullscreen_quad_get();
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_pixel_sh, psl->fx_shader_pass);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
   DRW_shgroup_uniform_int(fx_shgrp, "size", &fxd->size[0], 3);
@@ -386,7 +386,7 @@ static void DRW_gpencil_fx_rim(ShaderFxData *fx,
 
   /* prepare pass */
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_rim_prepare_sh, psl->fx_shader_pass_blend);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
   DRW_shgroup_uniform_vec2(fx_shgrp, "Viewport", DRW_viewport_size_get(), 1);
@@ -403,7 +403,7 @@ static void DRW_gpencil_fx_rim(ShaderFxData *fx,
 
   /* blur pass */
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_blur_sh, psl->fx_shader_pass_blend);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_fx);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_fx);
   DRW_shgroup_uniform_vec2(fx_shgrp, "Viewport", DRW_viewport_size_get(), 1);
@@ -417,7 +417,7 @@ static void DRW_gpencil_fx_rim(ShaderFxData *fx,
 
   /* resolve pass */
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_rim_resolve_sh, psl->fx_shader_pass_blend);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeRim", &e_data->temp_color_tx_fx);
@@ -453,7 +453,7 @@ static void DRW_gpencil_fx_shadow(ShaderFxData *fx,
   GPUBatch *fxquad = DRW_cache_fullscreen_quad_get();
   /* prepare pass */
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_shadow_prepare_sh, psl->fx_shader_pass_blend);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
   DRW_shgroup_uniform_vec2(fx_shgrp, "Viewport", DRW_viewport_size_get(), 1);
@@ -488,7 +488,7 @@ static void DRW_gpencil_fx_shadow(ShaderFxData *fx,
 
   /* blur pass */
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_blur_sh, psl->fx_shader_pass_blend);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_fx);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_fx);
   DRW_shgroup_uniform_vec2(fx_shgrp, "Viewport", DRW_viewport_size_get(), 1);
@@ -502,7 +502,7 @@ static void DRW_gpencil_fx_shadow(ShaderFxData *fx,
 
   /* resolve pass */
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_shadow_resolve_sh, psl->fx_shader_pass_blend);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "shadowColor", &e_data->temp_color_tx_fx);
@@ -531,7 +531,7 @@ static void DRW_gpencil_fx_glow(ShaderFxData *fx,
   GPUBatch *fxquad = DRW_cache_fullscreen_quad_get();
   /* prepare pass */
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_glow_prepare_sh, psl->fx_shader_pass_blend);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
 
@@ -544,7 +544,7 @@ static void DRW_gpencil_fx_glow(ShaderFxData *fx,
 
   /* blur pass */
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_blur_sh, psl->fx_shader_pass_blend);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_fx);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_fx);
   DRW_shgroup_uniform_vec2(fx_shgrp, "Viewport", DRW_viewport_size_get(), 1);
@@ -558,7 +558,7 @@ static void DRW_gpencil_fx_glow(ShaderFxData *fx,
 
   /* resolve pass */
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_glow_resolve_sh, psl->fx_shader_pass_blend);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "glowColor", &e_data->temp_color_tx_fx);
@@ -593,7 +593,7 @@ static void DRW_gpencil_fx_swirl(ShaderFxData *fx,
 
   GPUBatch *fxquad = DRW_cache_fullscreen_quad_get();
   fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_swirl_sh, psl->fx_shader_pass);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
 
@@ -624,7 +624,7 @@ static void DRW_gpencil_fx_wave(ShaderFxData *fx, GPENCIL_e_data *e_data, GPENCI
   GPUBatch *fxquad = DRW_cache_fullscreen_quad_get();
 
   DRWShadingGroup *fx_shgrp = DRW_shgroup_create(e_data->gpencil_fx_wave_sh, psl->fx_shader_pass);
-  DRW_shgroup_call_add(fx_shgrp, fxquad, NULL);
+  DRW_shgroup_call(fx_shgrp, fxquad, NULL);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeColor", &e_data->temp_color_tx_a);
   DRW_shgroup_uniform_texture_ref(fx_shgrp, "strokeDepth", &e_data->temp_depth_tx_a);
   DRW_shgroup_uniform_float(fx_shgrp, "amplitude", &fxd->amplitude, 1);
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index b19db4566dd..eacd319cc4a 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -579,7 +579,7 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata)
                                               DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_ALWAYS);
     grp = DRW_shgroup_create(e_data.ghost_resolve_sh, psl->ghost_resolve_pass);
     DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &e_data.ghost_depth_tx);
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   }
 
   {
@@ -613,7 +613,7 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata)
       DRW_shgroup_uniform_vec2(grp, "curvature_settings", &wpd->world_data.curvature_ridge, 1);
     }
 
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   }
 }
 
@@ -724,13 +724,13 @@ void workbench_deferred_cache_init(WORKBENCH_Data *vedata)
     if (OBJECT_OUTLINE_ENABLED(wpd)) {
       DRW_shgroup_uniform_texture_ref(grp, "objectId", &e_data.object_id_tx);
     }
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
 
     if (draw_ctx->rv3d && (draw_ctx->rv3d->rflag & RV3D_CLIPPING) && draw_ctx->rv3d->clipbb) {
       GPUShader *shader = GPU_shader_get_builtin_shader(GPU_SHADER_3D_UNIFORM_COLOR_BACKGROUND);
       grp = DRW_shgroup_create(shader, psl->background_pass);
       wpd->world_clip_planes_batch = DRW_draw_background_clipping_batch_from_rv3d(draw_ctx->rv3d);
-      DRW_shgroup_call_add(grp, wpd->world_clip_planes_batch, NULL);
+      DRW_shgroup_call(grp, wpd->world_clip_planes_batch, NULL);
       DRW_shgroup_uniform_vec4(grp, "color", &wpd->world_clip_planes_color[0], 1);
     }
   }
@@ -750,7 +750,7 @@ void workbench_deferred_cache_init(WORKBENCH_Data *vedata)
       DRW_shgroup_uniform_float(grp, "shadowMultiplier", &wpd->shadow_multiplier, 1);
       DRW_shgroup_uniform_float_copy(grp, "shadowShift", scene->display.shadow_shift);
       DRW_shgroup_uniform_float_copy(grp, "shadowFocus", wpd->shadow_focus);
-      DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+      DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
 
       /* Stencil Shadow passes. */
 #ifdef DEBUG_SHADOW_VOLUME
@@ -795,7 +795,7 @@ void workbench_deferred_cache_init(WORKBENCH_Data *vedata)
       DRW_shgroup_uniform_float(grp, "shadowMultiplier", &wpd->shadow_multiplier, 1);
       DRW_shgroup_uniform_float_copy(grp, "shadowShift", scene->display.shadow_shift);
       DRW_shgroup_uniform_float_copy(grp, "shadowFocus", wpd->shadow_focus);
-      DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+      DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
 #endif
     }
     else {
@@ -803,7 +803,7 @@ void workbench_deferred_cache_init(WORKBENCH_Data *vedata)
                                             DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_GREATER);
       grp = DRW_shgroup_create(wpd->composite_sh, psl->composite_pass);
       workbench_composite_uniforms(wpd, grp);
-      DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+      DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
     }
   }
 
@@ -837,7 +837,7 @@ void workbench_deferred_cache_init(WORKBENCH_Data *vedata)
       DRW_shgroup_uniform_texture_ref(grp, "transparentAccum", &e_data.oit_accum_tx);
       DRW_shgroup_uniform_texture_ref(grp, "transparentRevealage", &e_data.oit_revealage_tx);
       DRW_shgroup_uniform_vec2(grp, "invertedViewportSize", DRW_viewport_invert_size_get(), 1);
-      DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+      DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
     }
   }
 }
@@ -991,7 +991,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
             material = get_or_create_material_data(
                 vedata, ob, mat, image, iuser, color_type, interp);
           }
-          DRW_shgroup_call_object_add(material->shgrp, geom_array[i], ob);
+          DRW_shgroup_call_object(material->shgrp, geom_array[i], ob);
         }
       }
     }
@@ -1016,7 +1016,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
 
       if (is_sculpt_mode) {
         bool use_vcol = (color_type == V3D_SHADING_VERTEX_COLOR);
-        DRW_shgroup_call_sculpt_add(material->shgrp, ob, false, false, use_vcol);
+        DRW_shgroup_call_sculpt(material->shgrp, ob, false, false, use_vcol);
       }
       else {
         struct GPUBatch *geom;
@@ -1028,7 +1028,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
         }
 
         if (geom) {
-          DRW_shgroup_call_object_add(material->shgrp, geom, ob);
+          DRW_shgroup_call_object(material->shgrp, geom, ob);
         }
       }
     }
@@ -1052,7 +1052,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
           }
           shgrps[i] = material->shgrp;
         }
-        DRW_shgroup_call_sculpt_with_materials_add(shgrps, ob, false);
+        DRW_shgroup_call_sculpt_with_materials(shgrps, ob, false);
       }
       else {
         struct GPUBatch **geoms;
@@ -1075,7 +1075,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
               material = get_or_create_material_data(
                   vedata, ob, mat, NULL, NULL, V3D_SHADING_MATERIAL_COLOR, 0);
             }
-            DRW_shgroup_call_object_add(material->shgrp, geoms[i], ob);
+            DRW_shgroup_call_object(material->shgrp, geoms[i], ob);
           }
         }
       }
@@ -1089,7 +1089,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
           /* Currently unsupported in sculpt mode. We could revert to the slow
            * method in this case but I'm not sure if it's a good idea given that
            * sculpted meshes are heavy to begin with. */
-          // DRW_shgroup_call_sculpt_add(wpd->shadow_shgrp, ob, ob->obmat);
+          // DRW_shgroup_call_sculpt(wpd->shadow_shgrp, ob, ob->obmat);
         }
         else {
           WORKBENCH_ObjectData *engine_object_data = (WORKBENCH_ObjectData *)DRW_drawdata_ensure(
@@ -1118,7 +1118,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
               }
               DRW_shgroup_uniform_vec3(grp, "lightDirection", engine_object_data->shadow_dir, 1);
               DRW_shgroup_uniform_float_copy(grp, "lightDistance", 1e5f);
-              DRW_shgroup_call_add(grp, geom_shadow, ob->obmat);
+              DRW_shgroup_call(grp, geom_shadow, ob->obmat);
 #ifdef DEBUG_SHADOW_VOLUME
               DRW_debug_bbox(&engine_object_data->shadow_bbox, (float[4]){1.0f, 0.0f, 0.0f, 1.0f});
 #endif
@@ -1140,7 +1140,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
                 }
                 DRW_shgroup_uniform_vec3(grp, "lightDirection", engine_object_data->shadow_dir, 1);
                 DRW_shgroup_uniform_float_copy(grp, "lightDistance", extrude_distance);
-                DRW_shgroup_call_add(grp, DRW_cache_object_surface_get(ob), ob->obmat);
+                DRW_shgroup_call(grp, DRW_cache_object_surface_get(ob), ob->obmat);
               }
 
               if (is_manifold) {
@@ -1152,7 +1152,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
               }
               DRW_shgroup_uniform_vec3(grp, "lightDirection", engine_object_data->shadow_dir, 1);
               DRW_shgroup_uniform_float_copy(grp, "lightDistance", extrude_distance);
-              DRW_shgroup_call_add(grp, geom_shadow, ob->obmat);
+              DRW_shgroup_call(grp, geom_shadow, ob->obmat);
 #ifdef DEBUG_SHADOW_VOLUME
               DRW_debug_bbox(&engine_object_data->shadow_bbox, (float[4]){0.0f, 1.0f, 0.0f, 1.0f});
 #endif
diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.c b/source/blender/draw/engines/workbench/workbench_effect_dof.c
index 3dea99a76cf..ee8c8a0343f 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_dof.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_dof.c
@@ -314,37 +314,37 @@ void workbench_dof_create_pass(WORKBENCH_Data *vedata,
     DRW_shgroup_uniform_vec2(grp, "invertedViewportSize", DRW_viewport_invert_size_get(), 1);
     DRW_shgroup_uniform_vec3(grp, "dofParams", &wpd->dof_aperturesize, 1);
     DRW_shgroup_uniform_vec2(grp, "nearFar", wpd->dof_near_far, 1);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
 
   {
     DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_downsample_sh, psl->dof_down2_ps);
     DRW_shgroup_uniform_texture(grp, "sceneColorTex", txl->dof_source_tx);
     DRW_shgroup_uniform_texture(grp, "inputCocTex", txl->coc_halfres_tx);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
 #if 0
   {
     DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_flatten_h_sh,
                                               psl->dof_flatten_h_ps);
     DRW_shgroup_uniform_texture(grp, "inputCocTex", txl->coc_halfres_tx);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
   {
     DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_flatten_v_sh,
                                               psl->dof_flatten_v_ps);
     DRW_shgroup_uniform_texture(grp, "inputCocTex", wpd->coc_temp_tx);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
   {
     DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_dilate_v_sh, psl->dof_dilate_v_ps);
     DRW_shgroup_uniform_texture(grp, "inputCocTex", wpd->coc_tiles_tx[0]);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
   {
     DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_dilate_h_sh, psl->dof_dilate_h_ps);
     DRW_shgroup_uniform_texture(grp, "inputCocTex", wpd->coc_tiles_tx[1]);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
 #endif
   {
@@ -357,14 +357,14 @@ void workbench_dof_create_pass(WORKBENCH_Data *vedata,
     DRW_shgroup_uniform_texture(grp, "halfResColorTex", txl->dof_source_tx);
     DRW_shgroup_uniform_vec2(grp, "invertedViewportSize", DRW_viewport_invert_size_get(), 1);
     DRW_shgroup_uniform_float_copy(grp, "noiseOffset", offset);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
   {
     DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_blur2_sh, psl->dof_blur2_ps);
     DRW_shgroup_uniform_texture(grp, "inputCocTex", txl->coc_halfres_tx);
     DRW_shgroup_uniform_texture(grp, "blurTex", wpd->dof_blur_tx);
     DRW_shgroup_uniform_vec2(grp, "invertedViewportSize", DRW_viewport_invert_size_get(), 1);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
   {
     DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_resolve_sh, psl->dof_resolve_ps);
@@ -373,7 +373,7 @@ void workbench_dof_create_pass(WORKBENCH_Data *vedata,
     DRW_shgroup_uniform_vec2(grp, "invertedViewportSize", DRW_viewport_invert_size_get(), 1);
     DRW_shgroup_uniform_vec3(grp, "dofParams", &wpd->dof_aperturesize, 1);
     DRW_shgroup_uniform_vec2(grp, "nearFar", wpd->dof_near_far, 1);
-    DRW_shgroup_call_add(grp, quad, NULL);
+    DRW_shgroup_call(grp, quad, NULL);
   }
 }
 
diff --git a/source/blender/draw/engines/workbench/workbench_effect_fxaa.c b/source/blender/draw/engines/workbench/workbench_effect_fxaa.c
index 47355f324a8..6e3bf1658ab 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_fxaa.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_fxaa.c
@@ -49,7 +49,7 @@ DRWPass *workbench_fxaa_create_pass(GPUTexture **color_buffer_tx)
   DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_fxaa_sh, pass);
   DRW_shgroup_uniform_texture_ref(grp, "colorBuffer", color_buffer_tx);
   DRW_shgroup_uniform_vec2(grp, "invertedViewportSize", DRW_viewport_invert_size_get(), 1);
-  DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+  DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   return pass;
 }
 
diff --git a/source/blender/draw/engines/workbench/workbench_effect_taa.c b/source/blender/draw/engines/workbench/workbench_effect_taa.c
index 4b54b0772d3..7b2faf0ddcd 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_taa.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_taa.c
@@ -201,7 +201,7 @@ DRWPass *workbench_taa_create_pass(WORKBENCH_Data *vedata, GPUTexture **color_bu
   DRW_shgroup_uniform_texture_ref(grp, "colorBuffer", color_buffer_tx);
   DRW_shgroup_uniform_texture_ref(grp, "historyBuffer", &txl->history_buffer_tx);
   DRW_shgroup_uniform_float(grp, "mixFactor", &effect_info->taa_mix_factor, 1);
-  DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+  DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
 
   /*
    * Set the offset for the cavity shader so every iteration different
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c
index 2011afb723a..f12902b6801 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -401,7 +401,7 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata)
     DRW_shgroup_uniform_texture_ref(grp, "transparentRevealage", &e_data.transparent_revealage_tx);
     DRW_shgroup_uniform_block(grp, "world_block", wpd->world_ubo);
     DRW_shgroup_uniform_vec2(grp, "invertedViewportSize", DRW_viewport_invert_size_get(), 1);
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
   }
 
   /* TODO(campbell): displays but masks geometry,
@@ -413,7 +413,7 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata)
     GPUShader *shader = GPU_shader_get_builtin_shader(GPU_SHADER_3D_UNIFORM_COLOR_BACKGROUND);
     grp = DRW_shgroup_create(shader, psl->background_pass);
     wpd->world_clip_planes_batch = DRW_draw_background_clipping_batch_from_rv3d(draw_ctx->rv3d);
-    DRW_shgroup_call_add(grp, wpd->world_clip_planes_batch, NULL);
+    DRW_shgroup_call(grp, wpd->world_clip_planes_batch, NULL);
     DRW_shgroup_uniform_vec4(grp, "color", &wpd->world_clip_planes_color[0], 1);
   }
 
@@ -443,7 +443,7 @@ void workbench_forward_engine_init(WORKBENCH_Data *vedata)
     int state = DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_ALWAYS;
     psl->checker_depth_pass = DRW_pass_create("Checker Depth", state);
     grp = DRW_shgroup_create(e_data.checker_depth_sh, psl->checker_depth_pass);
-    DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
+    DRW_shgroup_call(grp, DRW_cache_fullscreen_quad_get(), NULL);
     DRW_shgroup_uniform_float_copy(grp, "threshold", blend_threshold);
     DRW_shgroup_uniform_float_copy(grp, "offset", noise_offset);
   }
@@ -582,8 +582,8 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob)
         int color_type = workbench_material_determine_color_type(wpd, image, ob, is_sculpt_mode);
         material = workbench_forward_get_or_create_material_data(
             vedata, ob, mat, image, iuser, color_type, interp, is_sculpt_mode);
-        DRW_shgroup_call_object_add(material->shgrp_object_outline, geom_array[i], ob);
-        DRW_shgroup_call_object_add(material->shgrp, geom_array[i], ob);
+        DRW_shgroup_call_object(material->shgrp_object_outline, geom_array[i], ob);
+        DRW_shgroup_call_object(material->shgrp, geom_array[i], ob);
       }
     }
     else if (ELEM(wpd->shading.color_type,
@@ -599,9 +599,9 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob)
             vedata, ob, NULL, NULL, NULL, color_type, 0, is_sculpt_mode);
         bool use_vcol = (color_type == V3D_SHADING_VERTEX_COLOR);
         /* TODO(fclem) make this call optional */
-        DRW_shgroup_call_sculpt_add(material->shgrp_object_outline, ob, false, false, false);
+        DRW_shgroup_call_sculpt(material->shgrp_object_outline, ob, false, false, false);
         if (!is_wire) {
-          DRW_shgroup_call_sculpt_add(material->shgrp, ob, false, false, use_vcol);
+          DRW_shgroup_call_sculpt(material->shgrp, ob, false, false, use_vcol);
         }
       }
       else {
@@ -612,9 +612,9 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob)
           material = workbench_forward_get_or_create_material_data(
               vedata, ob, NULL, NULL, NULL, color_type, 0, is_sculpt_mode);
           /* TODO(fclem) make this call optional */
-          DRW_shgroup_call_object_add(material->shgrp_object_outline, geom, ob);
+          DRW_shgroup_call_object(material->shgrp_object_outline, geom, ob);
           if (!is_wire) {
-            DRW_shgroup_call_object_add(material->shgrp, geom, ob);
+            DRW_shgroup_call_object(material->shgrp, geom, ob);
           }
         }
       }
@@ -631,9 +631,9 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob)
           shgrps[i] = material->shgrp;
         }
         /* TODO(fclem) make this call optional */
-        DRW_shgroup_call_sculpt_add(material->shgrp_object_outline, ob, false, false, false);
+        DRW_shgroup_call_sculpt(material->shgrp_object_outline, ob, false, false, false);
         if (!is_wire) {
-          DRW_shgroup_call_sculpt_with_materials_add(shgrps, ob, false);
+          DRW_shgroup_call_sculpt_with_materials(shgrps, ob, false);
         }
       }
       else {
@@ -652,9 +652,9 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob)
             material = workbench_forward_get_or_create_material_data(
                 vedata, ob, mat, NULL, NULL, V3D_SHADING_MATERIAL_COLOR, 0, is_sculpt_mode);
             /* TODO(fclem) make this call optional */
-            DRW_shgroup_call_object_add(material->shgrp_object_outline, mat_geom[i], ob);
+            DRW_shgroup_call_object(material->shgrp_object_outline, mat_geom[i], ob);
             if (!is_wire) {
-              DRW_shgroup_call_object_add(material->shgrp, mat_geom[i], ob);
+              DRW_shgroup_call_object(material->shgrp, mat_geom[i], ob);
             }
           }
         }
diff --git a/source/blender/draw/engines/workbench/workbench_volume.c b/source/blender/draw/engines/workbench/workbench_volume.c
index d2f19f57dcf..1620584dc06 100644
--- a/source/blender/draw/engines/workbench/workbench_volume.c
+++ b/source/blender/draw/engines/workbench/workbench_volume.c
@@ -211,10 +211,10 @@ void workbench_volume_cache_populate(WORKBENCH_Data *vedata,
   DRW_shgroup_uniform_float_copy(grp, "densityScale", 10.0f * sds->display_thickness);
 
   if (use_slice) {
-    DRW_shgroup_call_object_add(grp, DRW_cache_quad_get(), ob);
+    DRW_shgroup_call_object(grp, DRW_cache_quad_get(), ob);
   }
   else {
-    DRW_shgroup_call_object_add(grp, DRW_cache_cube_get(), ob);
+    DRW_shgroup_call_object(grp, DRW_cache_cube_get(), ob);
   }
 
   BLI_addtail(&wpd->smoke_domains, BLI_genericNodeN(smd));