Cleanup: replace UNUSED macro with commented args in C++ code

This is the conventional way of dealing with unused arguments in C++,
since it works on all compilers.

Regex find and replace: `UNUSED\((\w+)\)` -> `/*$1*/`

13 files changed, 22 insertions, 22 deletions

diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc
index f36a59a4ce6..2c9e5182b01 100644
--- a/source/blender/draw/engines/compositor/compositor_engine.cc
+++ b/source/blender/draw/engines/compositor/compositor_engine.cc
@@ -60,7 +60,7 @@ class Context : public realtime_compositor::Context {
     return DRW_viewport_texture_list_get()->color;
   }
 
-  GPUTexture *get_input_texture(int UNUSED(view_layer), eScenePassType UNUSED(pass_type)) override
+  GPUTexture *get_input_texture(int /*view_layer*/, eScenePassType /*pass_type*/) override
   {
     return get_output_texture();
   }
diff --git a/source/blender/draw/engines/eevee_next/eevee_engine.cc b/source/blender/draw/engines/eevee_next/eevee_engine.cc
index 5ef198838c9..214f6a001f0 100644
--- a/source/blender/draw/engines/eevee_next/eevee_engine.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_engine.cc
@@ -143,7 +143,7 @@ static void eevee_instance_free(void *instance)
 static void eevee_render_to_image(void *vedata,
                                   struct RenderEngine *engine,
                                   struct RenderLayer *layer,
-                                  const struct rcti *UNUSED(rect))
+                                  const struct rcti * /*rect*/)
 {
   if (!GPU_shader_storage_buffer_objects_support()) {
     return;
diff --git a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc
index 21d1948f03c..cc5a4d56231 100644
--- a/source/blender/draw/engines/eevee_next/eevee_pipeline.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_pipeline.cc
@@ -201,7 +201,7 @@ PassMain::Sub *ForwardPipeline::material_transparent_add(const Object *ob,
 void ForwardPipeline::render(View &view,
                              Framebuffer &prepass_fb,
                              Framebuffer &combined_fb,
-                             GPUTexture *UNUSED(combined_tx))
+                             GPUTexture * /*combined_tx*/)
 {
   UNUSED_VARS(view);
 
diff --git a/source/blender/draw/engines/eevee_next/eevee_sync.cc b/source/blender/draw/engines/eevee_next/eevee_sync.cc
index 09ea7c9ec3d..f2daba48d7a 100644
--- a/source/blender/draw/engines/eevee_next/eevee_sync.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_sync.cc
@@ -215,8 +215,8 @@ static void gpencil_drawcall_add(gpIterData &iter,
   iter.vcount = v_first + v_count - iter.vfirst;
 }
 
-static void gpencil_stroke_sync(bGPDlayer *UNUSED(gpl),
-                                bGPDframe *UNUSED(gpf),
+static void gpencil_stroke_sync(bGPDlayer * /*gpl*/,
+                                bGPDframe * /*gpf*/,
                                 bGPDstroke *gps,
                                 void *thunk)
 {
diff --git a/source/blender/draw/engines/eevee_next/eevee_velocity.cc b/source/blender/draw/engines/eevee_next/eevee_velocity.cc
index e7e4984f7de..b9a78e8547e 100644
--- a/source/blender/draw/engines/eevee_next/eevee_velocity.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_velocity.cc
@@ -51,8 +51,8 @@ void VelocityModule::init()
 
 static void step_object_sync_render(void *velocity,
                                     Object *ob,
-                                    RenderEngine *UNUSED(engine),
-                                    Depsgraph *UNUSED(depsgraph))
+                                    RenderEngine * /*engine*/,
+                                    Depsgraph * /*depsgraph*/)
 {
   ObjectKey object_key(ob);
   /* NOTE: Dummy resource handle since this will not be used for drawing. */
diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc
index a1a1de328f4..a2aef98a2b6 100644
--- a/source/blender/draw/engines/image/image_engine.cc
+++ b/source/blender/draw/engines/image/image_engine.cc
@@ -150,7 +150,7 @@ static void IMAGE_cache_init(void *vedata)
   image_engine.cache_populate();
 }
 
-static void IMAGE_cache_populate(void *UNUSED(vedata), Object *UNUSED(ob))
+static void IMAGE_cache_populate(void * /*vedata*/, Object * /*ob*/)
 {
   /* Function intentional left empty. `cache_populate` is required to be implemented. */
 }
diff --git a/source/blender/draw/engines/image/image_space_image.hh b/source/blender/draw/engines/image/image_space_image.hh
index 40aa117514c..7609cac8194 100644
--- a/source/blender/draw/engines/image/image_space_image.hh
+++ b/source/blender/draw/engines/image/image_space_image.hh
@@ -19,7 +19,7 @@ class SpaceImageAccessor : public AbstractSpaceAccessor {
   {
   }
 
-  Image *get_image(Main *UNUSED(bmain)) override
+  Image *get_image(Main * /*bmain*/) override
   {
     return ED_space_image(sima);
   }
@@ -29,12 +29,12 @@ class SpaceImageAccessor : public AbstractSpaceAccessor {
     return &sima->iuser;
   }
 
-  ImBuf *acquire_image_buffer(Image *UNUSED(image), void **lock) override
+  ImBuf *acquire_image_buffer(Image * /*image*/, void **lock) override
   {
     return ED_space_image_acquire_buffer(sima, lock, 0);
   }
 
-  void release_buffer(Image *UNUSED(image), ImBuf *image_buffer, void *lock) override
+  void release_buffer(Image * /*image*/, ImBuf *image_buffer, void *lock) override
   {
     ED_space_image_release_buffer(sima, image_buffer, lock);
   }
diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc
index dfbf4560271..45bdc9cd123 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.cc
+++ b/source/blender/draw/engines/overlay/overlay_armature.cc
@@ -1053,7 +1053,7 @@ static void bone_locked_color_shade(float color[4])
 }
 
 static const float *get_bone_solid_color(const ArmatureDrawContext *ctx,
-                                         const EditBone *UNUSED(eBone),
+                                         const EditBone * /*eBone*/,
                                          const bPoseChannel *pchan,
                                          const bArmature *arm,
                                          const int boneflag,
diff --git a/source/blender/draw/engines/overlay/overlay_facing.cc b/source/blender/draw/engines/overlay/overlay_facing.cc
index e40c32b30fc..825036ecd05 100644
--- a/source/blender/draw/engines/overlay/overlay_facing.cc
+++ b/source/blender/draw/engines/overlay/overlay_facing.cc
@@ -10,7 +10,7 @@
 
 #include "overlay_private.hh"
 
-void OVERLAY_facing_init(OVERLAY_Data *UNUSED(vedata))
+void OVERLAY_facing_init(OVERLAY_Data * /*vedata*/)
 {
 }
 
diff --git a/source/blender/draw/engines/overlay/overlay_fade.cc b/source/blender/draw/engines/overlay/overlay_fade.cc
index f99e77b75f2..d6fd4f9127a 100644
--- a/source/blender/draw/engines/overlay/overlay_fade.cc
+++ b/source/blender/draw/engines/overlay/overlay_fade.cc
@@ -12,7 +12,7 @@
 
 #include "overlay_private.hh"
 
-void OVERLAY_fade_init(OVERLAY_Data *UNUSED(vedata))
+void OVERLAY_fade_init(OVERLAY_Data * /*vedata*/)
 {
 }
 
diff --git a/source/blender/draw/engines/overlay/overlay_gpencil.cc b/source/blender/draw/engines/overlay/overlay_gpencil.cc
index 7e59a513437..30765b30ce6 100644
--- a/source/blender/draw/engines/overlay/overlay_gpencil.cc
+++ b/source/blender/draw/engines/overlay/overlay_gpencil.cc
@@ -364,8 +364,8 @@ static void OVERLAY_edit_gpencil_cache_populate(OVERLAY_Data *vedata, Object *ob
   }
 }
 
-static void overlay_gpencil_draw_stroke_color_name(bGPDlayer *UNUSED(gpl),
-                                                   bGPDframe *UNUSED(gpf),
+static void overlay_gpencil_draw_stroke_color_name(bGPDlayer * /*gpl*/,
+                                                   bGPDframe * /*gpf*/,
                                                    bGPDstroke *gps,
                                                    void *thunk)
 {
diff --git a/source/blender/draw/engines/overlay/overlay_outline.cc b/source/blender/draw/engines/overlay/overlay_outline.cc
index af348ae3c3e..00ceb930ba5 100644
--- a/source/blender/draw/engines/overlay/overlay_outline.cc
+++ b/source/blender/draw/engines/overlay/overlay_outline.cc
@@ -174,8 +174,8 @@ typedef struct iterData {
 } iterData;
 
 static void gpencil_layer_cache_populate(bGPDlayer *gpl,
-                                         bGPDframe *UNUSED(gpf),
-                                         bGPDstroke *UNUSED(gps),
+                                         bGPDframe * /*gpf*/,
+                                         bGPDstroke * /*gps*/,
                                          void *thunk)
 {
   iterData *iter = (iterData *)thunk;
@@ -197,8 +197,8 @@ static void gpencil_layer_cache_populate(bGPDlayer *gpl,
   DRW_shgroup_uniform_vec4_copy(grp, "gpDepthPlane", iter->plane);
 }
 
-static void gpencil_stroke_cache_populate(bGPDlayer *UNUSED(gpl),
-                                          bGPDframe *UNUSED(gpf),
+static void gpencil_stroke_cache_populate(bGPDlayer * /*gpl*/,
+                                          bGPDframe * /*gpf*/,
                                           bGPDstroke *gps,
                                           void *thunk)
 {
diff --git a/source/blender/draw/engines/workbench/workbench_shader.cc b/source/blender/draw/engines/workbench/workbench_shader.cc
index 9501e653d3b..acfe5adf728 100644
--- a/source/blender/draw/engines/workbench/workbench_shader.cc
+++ b/source/blender/draw/engines/workbench/workbench_shader.cc
@@ -194,7 +194,7 @@ GPUShader *workbench_shader_composite_get(WORKBENCH_PrivateData *wpd)
   return *shader;
 }
 
-GPUShader *workbench_shader_merge_infront_get(WORKBENCH_PrivateData *UNUSED(wpd))
+GPUShader *workbench_shader_merge_infront_get(WORKBENCH_PrivateData * /*wpd*/)
 {
   if (e_data.merge_infront_sh == nullptr) {
     e_data.merge_infront_sh = GPU_shader_create_from_info_name("workbench_merge_infront");
@@ -202,7 +202,7 @@ GPUShader *workbench_shader_merge_infront_get(WORKBENCH_PrivateData *UNUSED(wpd)
   return e_data.merge_infront_sh;
 }
 
-GPUShader *workbench_shader_transparent_resolve_get(WORKBENCH_PrivateData *UNUSED(wpd))
+GPUShader *workbench_shader_transparent_resolve_get(WORKBENCH_PrivateData * /*wpd*/)
 {
   if (e_data.oit_resolve_sh == nullptr) {
     e_data.oit_resolve_sh = GPU_shader_create_from_info_name("workbench_transparent_resolve");