diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-10-04 01:37:25 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-10-04 01:38:16 +0300 |
| commit | 97746129d5870beedc40e3c035c7982ce8a6bebc (patch) | |
| tree | b819b8e7875e6684aad7ea1f6bb7922d4fa1c8fc /source/blender/draw/intern | |
| parent | ed7f5713f8f9d605e3cd4cce42e40fb5c6bf4bf5 (diff) | |
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*/`
Diffstat (limited to 'source/blender/draw/intern')
33 files changed, 261 insertions, 264 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.cc b/source/blender/draw/intern/draw_cache_impl_mesh.cc index acab4798ea8..5a041493a6a 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.cc +++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc @@ -241,7 +241,7 @@ BLI_INLINE void mesh_cd_layers_type_clear(DRW_MeshCDMask *a) *((uint32_t *)a) = 0; } -static void mesh_cd_calc_edit_uv_layer(const Mesh *UNUSED(me), DRW_MeshCDMask *cd_used) +static void mesh_cd_calc_edit_uv_layer(const Mesh * /*me*/, DRW_MeshCDMask *cd_used) { cd_used->edit_uv = 1; } @@ -1402,8 +1402,7 @@ void DRW_mesh_batch_cache_create_requested(struct TaskGraph *task_graph, } }; #else - auto assert_deps_valid = [&](DRWBatchFlag UNUSED(batch_flag), - Span<int> UNUSED(used_buffer_indices)) {}; + auto assert_deps_valid = [&](DRWBatchFlag /*batch_flag*/, Span<int> /*used_buffer_indices*/) {}; #endif diff --git a/source/blender/draw/intern/draw_cache_impl_pointcloud.cc b/source/blender/draw/intern/draw_cache_impl_pointcloud.cc index 72be5b37652..9a8f48b33fa 100644 --- a/source/blender/draw/intern/draw_cache_impl_pointcloud.cc +++ b/source/blender/draw/intern/draw_cache_impl_pointcloud.cc @@ -304,7 +304,7 @@ GPUBatch *DRW_pointcloud_batch_cache_get_surface_viewer_attribute(Object *ob) } GPUBatch **DRW_cache_pointcloud_surface_shaded_get(Object *ob, - struct GPUMaterial **UNUSED(gpumat_array), + struct GPUMaterial ** /*gpumat_array*/, uint gpumat_array_len) { PointCloud &pointcloud = *static_cast<PointCloud *>(ob->data); diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index e494f9f4632..131e6c7a2af 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -903,13 +903,13 @@ static bool draw_subdiv_topology_info_cb(const SubdivForeachContext *foreach_con } static void draw_subdiv_vertex_corner_cb(const SubdivForeachContext *foreach_context, - void *UNUSED(tls), - const int UNUSED(ptex_face_index), - const float UNUSED(u), - const float UNUSED(v), + void * /*tls*/, + const int /*ptex_face_index*/, + const float /*u*/, + const float /*v*/, const int coarse_vertex_index, - const int UNUSED(coarse_poly_index), - const int UNUSED(coarse_corner), + const int /*coarse_poly_index*/, + const int /*coarse_corner*/, const int subdiv_vertex_index) { BLI_assert(coarse_vertex_index != ORIGINDEX_NONE); @@ -917,26 +917,26 @@ static void draw_subdiv_vertex_corner_cb(const SubdivForeachContext *foreach_con ctx->vert_origindex_map[subdiv_vertex_index] = coarse_vertex_index; } -static void draw_subdiv_vertex_edge_cb(const SubdivForeachContext *UNUSED(foreach_context), - void *UNUSED(tls_v), - const int UNUSED(ptex_face_index), - const float UNUSED(u), - const float UNUSED(v), - const int UNUSED(coarse_edge_index), - const int UNUSED(coarse_poly_index), - const int UNUSED(coarse_corner), - const int UNUSED(subdiv_vertex_index)) +static void draw_subdiv_vertex_edge_cb(const SubdivForeachContext * /*foreach_context*/, + void * /*tls_v*/, + const int /*ptex_face_index*/, + const float /*u*/, + const float /*v*/, + const int /*coarse_edge_index*/, + const int /*coarse_poly_index*/, + const int /*coarse_corner*/, + const int /*subdiv_vertex_index*/) { /* Required if SubdivForeachContext.vertex_corner is also set. */ } static void draw_subdiv_edge_cb(const SubdivForeachContext *foreach_context, - void *UNUSED(tls), + void * /*tls*/, const int coarse_edge_index, const int subdiv_edge_index, - const bool UNUSED(is_loose), - const int UNUSED(subdiv_v1), - const int UNUSED(subdiv_v2)) + const bool /*is_loose*/, + const int /*subdiv_v1*/, + const int /*subdiv_v2*/) { DRWCacheBuildingContext *ctx = (DRWCacheBuildingContext *)(foreach_context->user_data); @@ -956,13 +956,13 @@ static void draw_subdiv_edge_cb(const SubdivForeachContext *foreach_context, } static void draw_subdiv_loop_cb(const SubdivForeachContext *foreach_context, - void *UNUSED(tls_v), + void * /*tls_v*/, const int ptex_face_index, const float u, const float v, - const int UNUSED(coarse_loop_index), + const int /*coarse_loop_index*/, const int coarse_poly_index, - const int UNUSED(coarse_corner), + const int /*coarse_corner*/, const int subdiv_loop_index, const int subdiv_vertex_index, const int subdiv_edge_index) diff --git a/source/blender/draw/intern/draw_hair.cc b/source/blender/draw/intern/draw_hair.cc index ceee1c7cb48..4e44967e5e9 100644 --- a/source/blender/draw/intern/draw_hair.cc +++ b/source/blender/draw/intern/draw_hair.cc @@ -202,8 +202,8 @@ GPUVertBuf *DRW_hair_pos_buffer_get(Object *object, ParticleSystem *psys, Modifi } void DRW_hair_duplimat_get(Object *object, - ParticleSystem *UNUSED(psys), - ModifierData *UNUSED(md), + ParticleSystem * /*psys*/, + ModifierData * /*md*/, float (*dupli_mat)[4]) { Object *dupli_parent = DRW_object_get_dupli_parent(object); diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc index 25d56ea7a72..f5990010e9a 100644 --- a/source/blender/draw/intern/draw_manager_data.cc +++ b/source/blender/draw/intern/draw_manager_data.cc @@ -767,7 +767,7 @@ static DRWResourceHandle drw_resource_handle_new(float (*obmat)[4], Object *ob) return handle; } -uint32_t DRW_object_resource_id_get(Object *UNUSED(ob)) +uint32_t DRW_object_resource_id_get(Object * /*ob*/) { DRWResourceHandle handle = DST.ob_handle; if (handle == 0) { diff --git a/source/blender/draw/intern/draw_shader.cc b/source/blender/draw/intern/draw_shader.cc index 960348b4a94..dc08fa76335 100644 --- a/source/blender/draw/intern/draw_shader.cc +++ b/source/blender/draw/intern/draw_shader.cc @@ -32,13 +32,12 @@ static struct { /** \name Hair refinement * \{ */ -static GPUShader *hair_refine_shader_compute_create(ParticleRefineShader UNUSED(refinement)) +static GPUShader *hair_refine_shader_compute_create(ParticleRefineShader /*refinement*/) { return GPU_shader_create_from_info_name("draw_hair_refine_compute"); } -static GPUShader *hair_refine_shader_transform_feedback_create( - ParticleRefineShader UNUSED(refinement)) +static GPUShader *hair_refine_shader_transform_feedback_create(ParticleRefineShader /*refinement*/) { GPUShader *sh = nullptr; @@ -58,7 +57,7 @@ static GPUShader *hair_refine_shader_transform_feedback_create( } static GPUShader *hair_refine_shader_transform_feedback_workaround_create( - ParticleRefineShader UNUSED(refinement)) + ParticleRefineShader /*refinement*/) { return GPU_shader_create_from_info_name("draw_hair_refine_transform_feedback_workaround"); } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc index bf8dd1a51f8..be919b1af67 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc @@ -22,8 +22,8 @@ struct MeshExtract_EditUvElem_Data { }; static void extract_edituv_tris_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(tls_data); @@ -39,9 +39,9 @@ BLI_INLINE void edituv_tri_add( } } -static void extract_edituv_tris_iter_looptri_bm(const MeshRenderData *UNUSED(mr), +static void extract_edituv_tris_iter_looptri_bm(const MeshRenderData * /*mr*/, BMLoop **elt, - const int UNUSED(elt_index), + const int /*elt_index*/, void *_data) { MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(_data); @@ -55,7 +55,7 @@ static void extract_edituv_tris_iter_looptri_bm(const MeshRenderData *UNUSED(mr) static void extract_edituv_tris_iter_looptri_mesh(const MeshRenderData *mr, const MLoopTri *mlt, - const int UNUSED(elt_index), + const int /*elt_index*/, void *_data) { MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(_data); @@ -66,8 +66,8 @@ static void extract_edituv_tris_iter_looptri_mesh(const MeshRenderData *mr, edituv_tri_add(data, mp_hidden, mp_select, mlt->tri[0], mlt->tri[1], mlt->tri[2]); } -static void extract_edituv_tris_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_tris_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -78,8 +78,8 @@ static void extract_edituv_tris_finish(const MeshRenderData *UNUSED(mr), static void extract_edituv_tris_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(tls_data); @@ -90,8 +90,8 @@ static void extract_edituv_tris_init_subdiv(const DRWSubdivCache *subdiv_cache, data->sync_selection = (mr->toolsettings->uv_flag & UV_SYNC_SELECTION) != 0; } -static void extract_edituv_tris_iter_subdiv_bm(const DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *UNUSED(mr), +static void extract_edituv_tris_iter_subdiv_bm(const DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData * /*mr*/, void *_data, uint subdiv_quad_index, const BMFace *coarse_quad) @@ -114,7 +114,7 @@ static void extract_edituv_tris_iter_subdiv_bm(const DRWSubdivCache *UNUSED(subd loop_idx + 3); } -static void extract_edituv_tris_iter_subdiv_mesh(const DRWSubdivCache *UNUSED(subdiv_cache), +static void extract_edituv_tris_iter_subdiv_mesh(const DRWSubdivCache * /*subdiv_cache*/, const MeshRenderData *mr, void *_data, uint subdiv_quad_index, @@ -131,9 +131,9 @@ static void extract_edituv_tris_iter_subdiv_mesh(const DRWSubdivCache *UNUSED(su edituv_tri_add(data, mp_hidden, mp_select, loop_idx, loop_idx + 2, loop_idx + 3); } -static void extract_edituv_tris_finish_subdiv(const struct DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_tris_finish_subdiv(const struct DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -167,8 +167,8 @@ constexpr MeshExtract create_extractor_edituv_tris() * \{ */ static void extract_edituv_lines_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(tls_data); @@ -184,9 +184,9 @@ BLI_INLINE void edituv_edge_add( } } -static void extract_edituv_lines_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_edituv_lines_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(_data); @@ -234,8 +234,8 @@ static void extract_edituv_lines_iter_poly_mesh(const MeshRenderData *mr, } } -static void extract_edituv_lines_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_lines_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -246,8 +246,8 @@ static void extract_edituv_lines_finish(const MeshRenderData *UNUSED(mr), static void extract_edituv_lines_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(tls_data); @@ -318,9 +318,9 @@ static void extract_edituv_lines_iter_subdiv_mesh(const DRWSubdivCache *subdiv_c } } -static void extract_edituv_lines_finish_subdiv(const struct DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_lines_finish_subdiv(const struct DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -354,8 +354,8 @@ constexpr MeshExtract create_extractor_edituv_lines() * \{ */ static void extract_edituv_points_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(tls_data); @@ -373,9 +373,9 @@ BLI_INLINE void edituv_point_add(MeshExtract_EditUvElem_Data *data, } } -static void extract_edituv_points_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_edituv_points_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(_data); @@ -410,8 +410,8 @@ static void extract_edituv_points_iter_poly_mesh(const MeshRenderData *mr, } } -static void extract_edituv_points_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_points_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -422,8 +422,8 @@ static void extract_edituv_points_finish(const MeshRenderData *UNUSED(mr), static void extract_edituv_points_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(tls_data); @@ -433,7 +433,7 @@ static void extract_edituv_points_init_subdiv(const DRWSubdivCache *subdiv_cache } static void extract_edituv_points_iter_subdiv_bm(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, void *_data, uint subdiv_quad_index, const BMFace *coarse_quad) @@ -475,9 +475,9 @@ static void extract_edituv_points_iter_subdiv_mesh(const DRWSubdivCache *subdiv_ } } -static void extract_edituv_points_finish_subdiv(const struct DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_points_finish_subdiv(const struct DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -511,8 +511,8 @@ constexpr MeshExtract create_extractor_edituv_points() * \{ */ static void extract_edituv_fdots_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { MeshExtract_EditUvElem_Data *data = static_cast<MeshExtract_EditUvElem_Data *>(tls_data); @@ -533,7 +533,7 @@ BLI_INLINE void edituv_facedot_add(MeshExtract_EditUvElem_Data *data, } } -static void extract_edituv_fdots_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_edituv_fdots_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, const int f_index, void *_data) @@ -575,8 +575,8 @@ static void extract_edituv_fdots_iter_poly_mesh(const MeshRenderData *mr, } } -static void extract_edituv_fdots_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_edituv_fdots_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc index 8dc00617039..d964f608e52 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc @@ -15,15 +15,15 @@ namespace blender::draw { * \{ */ static void extract_fdots_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(tls_data); GPU_indexbuf_init(elb, GPU_PRIM_POINTS, mr->poly_len, mr->poly_len); } -static void extract_fdots_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_fdots_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, const int f_index, void *_userdata) @@ -69,8 +69,8 @@ static void extract_fdots_iter_poly_mesh(const MeshRenderData *mr, } } -static void extract_fdots_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_fdots_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_userdata) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc index 6b7d42ec67c..56e8baaca22 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc @@ -18,8 +18,8 @@ namespace blender::draw { * \{ */ static void extract_lines_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(tls_data); @@ -28,9 +28,9 @@ static void extract_lines_init(const MeshRenderData *mr, elb, GPU_PRIM_LINES, mr->edge_len + mr->edge_loose_len, mr->loop_len + mr->loop_loose_len); } -static void extract_lines_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_lines_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(data); @@ -52,7 +52,7 @@ static void extract_lines_iter_poly_bm(const MeshRenderData *UNUSED(mr), static void extract_lines_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *data) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(data); @@ -127,8 +127,8 @@ static void extract_lines_task_reduce(void *_userdata_to, void *_userdata_from) GPU_indexbuf_join(elb_to, elb_from); } -static void extract_lines_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_lines_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *data) { @@ -138,10 +138,10 @@ static void extract_lines_finish(const MeshRenderData *UNUSED(mr), } static void extract_lines_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; GPUIndexBuf *ibo = static_cast<GPUIndexBuf *>(buffer); @@ -158,7 +158,7 @@ static void extract_lines_init_subdiv(const DRWSubdivCache *subdiv_cache, static void extract_lines_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; if (loose_geom.edge_len == 0) { @@ -284,10 +284,10 @@ static void extract_lines_with_lines_loose_finish(const MeshRenderData *mr, } static void extract_lines_with_lines_loose_finish_subdiv(const struct DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, - void *UNUSED(buf), - void *UNUSED(_data)) + void * /*buf*/, + void * /*_data*/) { /* Multiply by 2 because these are edges indices. */ const int start = subdiv_cache->num_subdiv_loops * 2; @@ -326,18 +326,18 @@ constexpr MeshExtract create_extractor_lines_with_lines_loose() static void extract_lines_loose_only_init(const MeshRenderData *mr, MeshBatchCache *cache, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { BLI_assert(buf == cache->final.buff.ibo.lines_loose); UNUSED_VARS_NDEBUG(buf); extract_lines_loose_subbuffer(mr, cache); } -static void extract_lines_loose_only_init_subdiv(const DRWSubdivCache *UNUSED(subdiv_cache), +static void extract_lines_loose_only_init_subdiv(const DRWSubdivCache * /*subdiv_cache*/, const MeshRenderData *mr, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { BLI_assert(buffer == cache->final.buff.ibo.lines_loose); UNUSED_VARS_NDEBUG(buffer); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc index 32a262e4533..3124a35608d 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc @@ -42,8 +42,8 @@ static void line_adjacency_data_init(MeshExtract_LineAdjacency_Data *data, } static void extract_lines_adjacency_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { /* Similar to poly_to_tri_count(). @@ -96,9 +96,9 @@ BLI_INLINE void lines_adjacency_triangle( } } -static void extract_lines_adjacency_iter_looptri_bm(const MeshRenderData *UNUSED(mr), +static void extract_lines_adjacency_iter_looptri_bm(const MeshRenderData * /*mr*/, BMLoop **elt, - const int UNUSED(elt_index), + const int /*elt_index*/, void *_data) { MeshExtract_LineAdjacency_Data *data = static_cast<MeshExtract_LineAdjacency_Data *>(_data); @@ -115,7 +115,7 @@ static void extract_lines_adjacency_iter_looptri_bm(const MeshRenderData *UNUSED static void extract_lines_adjacency_iter_looptri_mesh(const MeshRenderData *mr, const MLoopTri *mlt, - const int UNUSED(elt_index), + const int /*elt_index*/, void *_data) { MeshExtract_LineAdjacency_Data *data = static_cast<MeshExtract_LineAdjacency_Data *>(_data); @@ -132,7 +132,7 @@ static void extract_lines_adjacency_iter_looptri_mesh(const MeshRenderData *mr, data); } -static void extract_lines_adjacency_finish(const MeshRenderData *UNUSED(mr), +static void extract_lines_adjacency_finish(const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buf, void *_data) @@ -166,9 +166,9 @@ static void extract_lines_adjacency_finish(const MeshRenderData *UNUSED(mr), } static void extract_lines_adjacency_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, + void * /*buf*/, void *_data) { MeshExtract_LineAdjacency_Data *data = static_cast<MeshExtract_LineAdjacency_Data *>(_data); @@ -182,7 +182,7 @@ static void extract_lines_adjacency_init_subdiv(const DRWSubdivCache *subdiv_cac } static void extract_lines_adjacency_iter_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, void *_data, uint subdiv_quad_index) { @@ -207,7 +207,7 @@ static void extract_lines_adjacency_iter_subdiv_bm(const DRWSubdivCache *subdiv_ const MeshRenderData *mr, void *_data, uint subdiv_quad_index, - const BMFace *UNUSED(coarse_quad)) + const BMFace * /*coarse_quad*/) { extract_lines_adjacency_iter_subdiv(subdiv_cache, mr, _data, subdiv_quad_index); } @@ -216,12 +216,12 @@ static void extract_lines_adjacency_iter_subdiv_mesh(const DRWSubdivCache *subdi const MeshRenderData *mr, void *_data, uint subdiv_quad_index, - const MPoly *UNUSED(coarse_quad)) + const MPoly * /*coarse_quad*/) { extract_lines_adjacency_iter_subdiv(subdiv_cache, mr, _data, subdiv_quad_index); } -static void extract_lines_adjacency_finish_subdiv(const DRWSubdivCache *UNUSED(subdiv_cache), +static void extract_lines_adjacency_finish_subdiv(const DRWSubdivCache * /*subdiv_cache*/, const MeshRenderData *mr, MeshBatchCache *cache, void *buf, diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc index 3977ba492ca..572eb5b28f8 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc @@ -26,8 +26,8 @@ struct MeshExtract_LinePaintMask_Data { }; static void extract_lines_paint_mask_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { MeshExtract_LinePaintMask_Data *data = static_cast<MeshExtract_LinePaintMask_Data *>(tls_data); @@ -75,8 +75,8 @@ static void extract_lines_paint_mask_iter_poly_mesh(const MeshRenderData *mr, } } -static void extract_lines_paint_mask_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_lines_paint_mask_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -88,8 +88,8 @@ static void extract_lines_paint_mask_finish(const MeshRenderData *UNUSED(mr), static void extract_lines_paint_mask_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { MeshExtract_LinePaintMask_Data *data = static_cast<MeshExtract_LinePaintMask_Data *>(tls_data); @@ -150,12 +150,11 @@ static void extract_lines_paint_mask_iter_subdiv_mesh(const DRWSubdivCache *subd } } -static void extract_lines_paint_mask_finish_subdiv( - const struct DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *mr, - MeshBatchCache *cache, - void *buf, - void *_data) +static void extract_lines_paint_mask_finish_subdiv(const struct DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData *mr, + MeshBatchCache *cache, + void *buf, + void *_data) { extract_lines_paint_mask_finish(mr, cache, buf, _data); } diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc index 48eeb86e5ee..e84f122d03e 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc @@ -19,8 +19,8 @@ namespace blender::draw { * \{ */ static void extract_points_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), + MeshBatchCache * /*cache*/, + void * /*buf*/, void *tls_data) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(tls_data); @@ -53,9 +53,9 @@ BLI_INLINE void vert_set_mesh(GPUIndexBufBuilder *elb, } } -static void extract_points_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_points_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_userdata) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(_userdata); @@ -70,7 +70,7 @@ static void extract_points_iter_poly_bm(const MeshRenderData *UNUSED(mr), static void extract_points_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *_userdata) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(_userdata); @@ -113,7 +113,7 @@ static void extract_points_iter_lvert_bm(const MeshRenderData *mr, } static void extract_points_iter_lvert_mesh(const MeshRenderData *mr, - const MVert *UNUSED(mv), + const MVert * /*mv*/, const int lvert_index, void *_userdata) { @@ -129,8 +129,8 @@ static void extract_points_task_reduce(void *_userdata_to, void *_userdata_from) GPU_indexbuf_join(elb_to, elb_from); } -static void extract_points_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_points_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_userdata) { @@ -141,8 +141,8 @@ static void extract_points_finish(const MeshRenderData *UNUSED(mr), static void extract_points_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(buffer), + MeshBatchCache * /*cache*/, + void * /*buffer*/, void *data) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(data); @@ -194,7 +194,7 @@ static void extract_points_iter_subdiv_bm(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, void *_data, uint subdiv_quad_index, - const BMFace *UNUSED(coarse_quad)) + const BMFace * /*coarse_quad*/) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(_data); extract_points_iter_subdiv_common(elb, mr, subdiv_cache, subdiv_quad_index, true); @@ -204,7 +204,7 @@ static void extract_points_iter_subdiv_mesh(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, void *_data, uint subdiv_quad_index, - const MPoly *UNUSED(coarse_quad)) + const MPoly * /*coarse_quad*/) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(_data); extract_points_iter_subdiv_common(elb, mr, subdiv_cache, subdiv_quad_index, false); @@ -212,7 +212,7 @@ static void extract_points_iter_subdiv_mesh(const DRWSubdivCache *subdiv_cache, static void extract_points_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - void *UNUSED(buffer), + void * /*buffer*/, void *data) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; @@ -281,9 +281,9 @@ static void extract_points_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, } } -static void extract_points_finish_subdiv(const DRWSubdivCache *UNUSED(subdiv_cache), - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), +static void extract_points_finish_subdiv(const DRWSubdivCache * /*subdiv_cache*/, + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *_userdata) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc index 2e3e6c7b6b1..da3560389e4 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc @@ -25,8 +25,8 @@ static void extract_tris_mat_task_reduce(void *_userdata_to, void *_userdata_fro * \{ */ static void extract_tris_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(tls_data); @@ -110,10 +110,10 @@ static void extract_tris_finish(const MeshRenderData *mr, } static void extract_tris_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { GPUIndexBuf *ibo = static_cast<GPUIndexBuf *>(buffer); /* Initialize the index buffer, it was already allocated, it will be filled on the device. */ @@ -157,15 +157,15 @@ constexpr MeshExtract create_extractor_tris() * \{ */ static void extract_tris_single_mat_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), - void *UNUSED(ibo), + MeshBatchCache * /*cache*/, + void * /*ibo*/, void *tls_data) { GPUIndexBufBuilder *elb = static_cast<GPUIndexBufBuilder *>(tls_data); GPU_indexbuf_init(elb, GPU_PRIM_TRIS, mr->tri_len, mr->loop_len); } -static void extract_tris_single_mat_iter_looptri_bm(const MeshRenderData *UNUSED(mr), +static void extract_tris_single_mat_iter_looptri_bm(const MeshRenderData * /*mr*/, BMLoop **elt, const int elt_index, void *_data) diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc index c602b768df9..1817591b6a3 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc @@ -280,7 +280,7 @@ static void extract_attr_generic(const MeshRenderData *mr, } static void extract_attr_init( - const MeshRenderData *mr, MeshBatchCache *cache, void *buf, void *UNUSED(tls_data), int index) + const MeshRenderData *mr, MeshBatchCache *cache, void *buf, void * /*tls_data*/, int index) { const DRW_Attributes *attrs_used = &cache->attr_used; const DRW_AttributeRequest &request = attrs_used->requests[index]; @@ -327,7 +327,7 @@ static void extract_attr_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, MeshBatchCache *cache, void *buffer, - void *UNUSED(tls_data), + void * /*tls_data*/, int index) { const DRW_Attributes *attrs_used = &cache->attr_used; @@ -435,9 +435,9 @@ constexpr MeshExtract create_extractor_attr(ExtractInitFn fn, ExtractInitSubdivF } static void extract_mesh_attr_viewer_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); static GPUVertFormat format = {0}; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc index 50c37f6397c..a968bd07c87 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc @@ -43,7 +43,7 @@ static float loop_edge_factor_get(const float f_no[3], } static void extract_edge_fac_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -82,7 +82,7 @@ static void extract_edge_fac_init(const MeshRenderData *mr, static void extract_edge_fac_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_EdgeFac_Data *data = static_cast<MeshExtract_EdgeFac_Data *>(_data); @@ -146,7 +146,7 @@ static void extract_edge_fac_iter_poly_mesh(const MeshRenderData *mr, } static void extract_edge_fac_iter_ledge_bm(const MeshRenderData *mr, - const BMEdge *UNUSED(eed), + const BMEdge * /*eed*/, const int ledge_index, void *_data) { @@ -156,7 +156,7 @@ static void extract_edge_fac_iter_ledge_bm(const MeshRenderData *mr, } static void extract_edge_fac_iter_ledge_mesh(const MeshRenderData *mr, - const MEdge *UNUSED(med), + const MEdge * /*med*/, const int ledge_index, void *_data) { @@ -167,7 +167,7 @@ static void extract_edge_fac_iter_ledge_mesh(const MeshRenderData *mr, } static void extract_edge_fac_finish(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *_data) { @@ -217,10 +217,10 @@ static GPUVertFormat *get_subdiv_edge_fac_format() } static void extract_edge_fac_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; GPUVertBuf *edge_idx = cache->final.buff.vbo.edge_idx; @@ -252,9 +252,9 @@ static void extract_edge_fac_init_subdiv(const DRWSubdivCache *subdiv_cache, } static void extract_edge_fac_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; if (loose_geom.edge_len == 0) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc index 097e45ad3ee..31dc2fdff6a 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc @@ -112,7 +112,7 @@ static GPUVertFormat *get_edit_data_format() } static void extract_edit_data_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -126,7 +126,7 @@ static void extract_edit_data_init(const MeshRenderData *mr, static void extract_edit_data_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { EditLoopData *vbo_data = *(EditLoopData **)_data; @@ -223,7 +223,7 @@ static void extract_edit_data_iter_lvert_bm(const MeshRenderData *mr, } static void extract_edit_data_iter_lvert_mesh(const MeshRenderData *mr, - const MVert *UNUSED(mv), + const MVert * /*mv*/, const int lvert_index, void *_data) { @@ -240,8 +240,8 @@ static void extract_edit_data_iter_lvert_mesh(const MeshRenderData *mr, } static void extract_edit_data_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, void *data) { @@ -307,7 +307,7 @@ static void extract_edit_data_iter_subdiv_mesh(const DRWSubdivCache *subdiv_cach static void extract_edit_data_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - void *UNUSED(buffer), + void * /*buffer*/, void *_data) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc index 504d4a6956a..3ebf2daf1e9 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc @@ -43,7 +43,7 @@ static void extract_edituv_data_init_common(const MeshRenderData *mr, } static void extract_edituv_data_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -54,7 +54,7 @@ static void extract_edituv_data_init(const MeshRenderData *mr, static void extract_edituv_data_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { BMLoop *l_iter, *l_first; @@ -114,7 +114,7 @@ static void extract_edituv_data_iter_poly_mesh(const MeshRenderData *mr, static void extract_edituv_data_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc index 683abf24f03..492756f30bb 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc @@ -74,7 +74,7 @@ static void edituv_get_edituv_stretch_angle(float auv[2][2], } static void extract_edituv_stretch_angle_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -104,7 +104,7 @@ static void extract_edituv_stretch_angle_init(const MeshRenderData *mr, static void extract_edituv_stretch_angle_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_StretchAngle_Data *data = static_cast<MeshExtract_StretchAngle_Data *>(_data); @@ -157,7 +157,7 @@ static void extract_edituv_stretch_angle_iter_poly_bm(const MeshRenderData *mr, static void extract_edituv_stretch_angle_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *_data) { MeshExtract_StretchAngle_Data *data = static_cast<MeshExtract_StretchAngle_Data *>(_data); @@ -214,7 +214,7 @@ static void extract_edituv_stretch_angle_init_subdiv(const DRWSubdivCache *subdi const MeshRenderData *mr, MeshBatchCache *cache, void *buffer, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *refined_vbo = static_cast<GPUVertBuf *>(buffer); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc index 9679c0523f8..7c96fbd6a99 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc @@ -20,9 +20,9 @@ namespace blender::draw { * \{ */ static void extract_edituv_stretch_area_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); static GPUVertFormat format = {0}; @@ -90,7 +90,7 @@ static void compute_area_ratio(const MeshRenderData *mr, static void extract_edituv_stretch_area_finish(const MeshRenderData *mr, MeshBatchCache *cache, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); float *area_ratio = static_cast<float *>(MEM_mallocN(sizeof(float) * mr->poly_len, __func__)); @@ -126,7 +126,7 @@ static void extract_edituv_stretch_area_init_subdiv(const DRWSubdivCache *subdiv const MeshRenderData *mr, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { /* Initialize final buffer. */ diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc index 27d1975d67b..55ad2e67487 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc @@ -21,7 +21,7 @@ struct MeshExtract_EditUVFdotData_Data { }; static void extract_fdots_edituv_data_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -41,7 +41,7 @@ static void extract_fdots_edituv_data_init(const MeshRenderData *mr, static void extract_fdots_edituv_data_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_EditUVFdotData_Data *data = static_cast<MeshExtract_EditUVFdotData_Data *>(_data); @@ -51,7 +51,7 @@ static void extract_fdots_edituv_data_iter_poly_bm(const MeshRenderData *mr, } static void extract_fdots_edituv_data_iter_poly_mesh(const MeshRenderData *mr, - const MPoly *UNUSED(mp), + const MPoly * /*mp*/, const int mp_index, void *_data) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc index c47cde63630..02e4b877562 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc @@ -19,9 +19,9 @@ namespace blender::draw { #define NOR_AND_FLAG_HIDDEN -2 static void extract_fdots_nor_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); static GPUVertFormat format = {0}; @@ -34,9 +34,9 @@ static void extract_fdots_nor_init(const MeshRenderData *mr, } static void extract_fdots_nor_finish(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); static float invalid_normal[3] = {0.0f, 0.0f, 0.0f}; @@ -99,9 +99,9 @@ constexpr MeshExtract create_extractor_fdots_nor() * \{ */ static void extract_fdots_nor_hq_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); static GPUVertFormat format = {0}; @@ -114,9 +114,9 @@ static void extract_fdots_nor_hq_init(const MeshRenderData *mr, } static void extract_fdots_nor_hq_finish(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); static float invalid_normal[3] = {0.0f, 0.0f, 0.0f}; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc index 8bc4d7fe7c7..6d93a482623 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc @@ -36,7 +36,7 @@ static GPUVertFormat *get_fdots_nor_format_subdiv() } static void extract_fdots_pos_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -100,10 +100,10 @@ static void extract_fdots_pos_iter_poly_mesh(const MeshRenderData *mr, } static void extract_fdots_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { /* We "extract" positions, normals, and indices at once. */ GPUVertBuf *fdots_pos_vbo = static_cast<GPUVertBuf *>(buffer); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc index 0c1b58a035f..96240af2ee6 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc @@ -22,7 +22,7 @@ struct MeshExtract_FdotUV_Data { }; static void extract_fdots_uv_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -53,9 +53,9 @@ static void extract_fdots_uv_init(const MeshRenderData *mr, } } -static void extract_fdots_uv_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_fdots_uv_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_FdotUV_Data *data = static_cast<MeshExtract_FdotUV_Data *>(_data); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc index b27d6577877..ff0d502ea1e 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc @@ -16,7 +16,7 @@ namespace blender::draw { * \{ */ static void extract_lnor_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -34,7 +34,7 @@ static void extract_lnor_init(const MeshRenderData *mr, static void extract_lnor_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { BMLoop *l_iter, *l_first; @@ -106,10 +106,10 @@ static GPUVertFormat *get_subdiv_lnor_format() } static void extract_lnor_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buffer); GPUVertBuf *pos_nor = cache->final.buff.vbo.pos_nor; @@ -143,7 +143,7 @@ struct gpuHQNor { }; static void extract_lnor_hq_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -161,7 +161,7 @@ static void extract_lnor_hq_init(const MeshRenderData *mr, static void extract_lnor_hq_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { BMLoop *l_iter, *l_first; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc index a803fcaac1c..d0d97054448 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc @@ -23,9 +23,9 @@ namespace blender::draw { * \{ */ static void extract_mesh_analysis_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); static GPUVertFormat format = {0}; @@ -265,7 +265,7 @@ struct BVHTree_OverlapData { float epsilon; }; -static bool bvh_overlap_cb(void *userdata, int index_a, int index_b, int UNUSED(thread)) +static bool bvh_overlap_cb(void *userdata, int index_a, int index_b, int /*thread*/) { struct BVHTree_OverlapData *data = static_cast<struct BVHTree_OverlapData *>(userdata); @@ -367,7 +367,7 @@ static void statvis_calc_intersect(const MeshRenderData *mr, float *r_intersect) } } -BLI_INLINE float distort_remap(float fac, float min, float UNUSED(max), float minmax_irange) +BLI_INLINE float distort_remap(float fac, float min, float /*max*/, float minmax_irange) { if (fac >= min) { fac = (fac - min) * minmax_irange; @@ -474,7 +474,7 @@ static void statvis_calc_distort(const MeshRenderData *mr, float *r_distort) } } -BLI_INLINE float sharp_remap(float fac, float min, float UNUSED(max), float minmax_irange) +BLI_INLINE float sharp_remap(float fac, float min, float /*max*/, float minmax_irange) { /* important not '>=' */ if (fac > min) { @@ -588,9 +588,9 @@ static void statvis_calc_sharp(const MeshRenderData *mr, float *r_sharp) } static void extract_analysis_iter_finish_mesh(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); BLI_assert(mr->edit_bmesh); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc index 4fcbdb1fc7c..915495204d4 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc @@ -19,7 +19,7 @@ struct MeshExtract_Orco_Data { }; static void extract_orco_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -45,9 +45,9 @@ static void extract_orco_init(const MeshRenderData *mr, BLI_assert(data->orco); } -static void extract_orco_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_orco_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { MeshExtract_Orco_Data *orco_data = (MeshExtract_Orco_Data *)data; @@ -63,7 +63,7 @@ static void extract_orco_iter_poly_bm(const MeshRenderData *UNUSED(mr), static void extract_orco_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *data) { const MLoop *mloop = mr->mloop; diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc index 9d8197964ee..30b4f808487 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc @@ -28,7 +28,7 @@ struct MeshExtract_PosNor_Data { }; static void extract_pos_nor_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -66,7 +66,7 @@ static void extract_pos_nor_init(const MeshRenderData *mr, static void extract_pos_nor_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_PosNor_Data *data = static_cast<MeshExtract_PosNor_Data *>(_data); @@ -171,9 +171,9 @@ static void extract_pos_nor_iter_lvert_mesh(const MeshRenderData *mr, vert->nor = data->normals[v_index].low; } -static void extract_pos_nor_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), +static void extract_pos_nor_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, + void * /*buf*/, void *_data) { MeshExtract_PosNor_Data *data = static_cast<MeshExtract_PosNor_Data *>(_data); @@ -201,10 +201,10 @@ static GPUVertFormat *get_custom_normals_format() } static void extract_pos_nor_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buffer); const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; @@ -282,9 +282,9 @@ static void extract_pos_nor_init_subdiv(const DRWSubdivCache *subdiv_cache, } static void extract_pos_nor_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; if (loose_geom.loop_len == 0) { @@ -373,7 +373,7 @@ struct MeshExtract_PosNorHQ_Data { }; static void extract_pos_nor_hq_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -411,7 +411,7 @@ static void extract_pos_nor_hq_init(const MeshRenderData *mr, static void extract_pos_nor_hq_iter_poly_bm(const MeshRenderData *mr, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_PosNorHQ_Data *data = static_cast<MeshExtract_PosNorHQ_Data *>(_data); @@ -429,7 +429,7 @@ static void extract_pos_nor_hq_iter_poly_bm(const MeshRenderData *mr, static void extract_pos_nor_hq_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *_data) { MeshExtract_PosNorHQ_Data *data = static_cast<MeshExtract_PosNorHQ_Data *>(_data); @@ -523,9 +523,9 @@ static void extract_pos_nor_hq_iter_lvert_mesh(const MeshRenderData *mr, vert->nor[3] = 0; } -static void extract_pos_nor_hq_finish(const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), - void *UNUSED(buf), +static void extract_pos_nor_hq_finish(const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, + void * /*buf*/, void *_data) { MeshExtract_PosNorHQ_Data *data = static_cast<MeshExtract_PosNorHQ_Data *>(_data); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc index b33071f1d56..34b8124f872 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc @@ -32,9 +32,9 @@ static GPUVertFormat *get_sculpt_data_format() } static void extract_sculpt_data_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); GPUVertFormat *format = get_sculpt_data_format(); @@ -115,9 +115,9 @@ static void extract_sculpt_data_init(const MeshRenderData *mr, static void extract_sculpt_data_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buffer, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buffer); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc index 9e0d171c9e4..5c196a67d0b 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc @@ -14,7 +14,7 @@ namespace blender::draw { /** \name Extract Selection Index * \{ */ -static void extract_select_idx_init_impl(const MeshRenderData *UNUSED(mr), +static void extract_select_idx_init_impl(const MeshRenderData * /*mr*/, const int len, void *buf, void *tls_data) @@ -30,7 +30,7 @@ static void extract_select_idx_init_impl(const MeshRenderData *UNUSED(mr), } static void extract_select_idx_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { @@ -42,7 +42,7 @@ static void extract_select_idx_init(const MeshRenderData *mr, * index VBO's. We could upload the p/e/v_origindex as a buffer texture and sample it inside the * shader to output original index. */ -static void extract_poly_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_poly_idx_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, const int f_index, void *data) @@ -55,9 +55,9 @@ static void extract_poly_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), } while ((l_iter = l_iter->next) != l_first); } -static void extract_edge_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_edge_idx_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { BMLoop *l_iter, *l_first; @@ -68,9 +68,9 @@ static void extract_edge_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), } while ((l_iter = l_iter->next) != l_first); } -static void extract_vert_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_vert_idx_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *data) { BMLoop *l_iter, *l_first; @@ -122,7 +122,7 @@ static void extract_poly_idx_iter_poly_mesh(const MeshRenderData *mr, static void extract_edge_idx_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *data) { const MLoop *mloop = mr->mloop; @@ -135,7 +135,7 @@ static void extract_edge_idx_iter_poly_mesh(const MeshRenderData *mr, static void extract_vert_idx_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *data) { const MLoop *mloop = mr->mloop; @@ -147,7 +147,7 @@ static void extract_vert_idx_iter_poly_mesh(const MeshRenderData *mr, } static void extract_edge_idx_iter_ledge_mesh(const MeshRenderData *mr, - const MEdge *UNUSED(med), + const MEdge * /*med*/, const int ledge_index, void *data) { @@ -169,7 +169,7 @@ static void extract_vert_idx_iter_ledge_mesh(const MeshRenderData *mr, } static void extract_vert_idx_iter_lvert_mesh(const MeshRenderData *mr, - const MVert *UNUSED(mv), + const MVert * /*mv*/, const int lvert_index, void *data) { @@ -182,9 +182,9 @@ static void extract_vert_idx_iter_lvert_mesh(const MeshRenderData *mr, static void extract_vert_idx_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; @@ -213,7 +213,7 @@ static void extract_vert_idx_init_subdiv(const DRWSubdivCache *subdiv_cache, static void extract_vert_idx_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; if (loose_geom.loop_len == 0) { @@ -254,10 +254,10 @@ static void extract_vert_idx_loose_geom_subdiv(const DRWSubdivCache *subdiv_cach } static void extract_edge_idx_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), - MeshBatchCache *UNUSED(cache), + const MeshRenderData * /*mr*/, + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; @@ -271,7 +271,7 @@ static void extract_edge_idx_init_subdiv(const DRWSubdivCache *subdiv_cache, static void extract_edge_idx_loose_geom_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, void *buffer, - void *UNUSED(data)) + void * /*data*/) { const DRWSubdivLooseGeom &loose_geom = subdiv_cache->loose_geom; if (loose_geom.edge_len == 0) { @@ -294,9 +294,9 @@ static void extract_edge_idx_loose_geom_subdiv(const DRWSubdivCache *subdiv_cach static void extract_poly_idx_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(data)) + void * /*data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); draw_subdiv_init_origindex_buffer( @@ -366,15 +366,15 @@ constexpr MeshExtract create_extractor_vert_idx() } static void extract_fdot_idx_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, void *tls_data) { extract_select_idx_init_impl(mr, mr->poly_len, buf, tls_data); } -static void extract_fdot_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), - const BMFace *UNUSED(f), +static void extract_fdot_idx_iter_poly_bm(const MeshRenderData * /*mr*/, + const BMFace * /*f*/, const int f_index, void *data) { @@ -382,7 +382,7 @@ static void extract_fdot_idx_iter_poly_bm(const MeshRenderData *UNUSED(mr), } static void extract_fdot_idx_iter_poly_mesh(const MeshRenderData *mr, - const MPoly *UNUSED(mp), + const MPoly * /*mp*/, const int mp_index, void *data) { diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc index f7655658bdd..e8feb4bebce 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc @@ -19,9 +19,9 @@ struct SkinRootData { }; static void extract_skin_roots_init(const MeshRenderData *mr, - MeshBatchCache *UNUSED(cache), + MeshBatchCache * /*cache*/, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); /* Exclusively for edit mode. */ diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc index 60ade9daadc..6f0c98c684b 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc @@ -237,7 +237,7 @@ static void extract_tan_ex_init(const MeshRenderData *mr, static void extract_tan_init(const MeshRenderData *mr, MeshBatchCache *cache, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); extract_tan_ex_init(mr, cache, vbo, false); @@ -256,7 +256,7 @@ static void extract_tan_init_subdiv(const DRWSubdivCache *subdiv_cache, const MeshRenderData *mr, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { GPUVertCompType comp_type = GPU_COMP_F32; GPUVertFetchMode fetch_mode = GPU_FETCH_FLOAT; @@ -346,7 +346,7 @@ constexpr MeshExtract create_extractor_tan() static void extract_tan_hq_init(const MeshRenderData *mr, MeshBatchCache *cache, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); extract_tan_ex_init(mr, cache, vbo, true); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc index cbade20dd03..fe6e31af3c2 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc @@ -74,7 +74,7 @@ static bool mesh_extract_uv_format_init(GPUVertFormat *format, static void extract_uv_init(const MeshRenderData *mr, MeshBatchCache *cache, void *buf, - void *UNUSED(tls_data)) + void * /*tls_data*/) { GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf); GPUVertFormat format = {0}; @@ -119,10 +119,10 @@ static void extract_uv_init(const MeshRenderData *mr, } static void extract_uv_init_subdiv(const DRWSubdivCache *subdiv_cache, - const MeshRenderData *UNUSED(mr), + const MeshRenderData * /*mr*/, MeshBatchCache *cache, void *buffer, - void *UNUSED(data)) + void * /*data*/) { Mesh *coarse_mesh = subdiv_cache->mesh; GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buffer); diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc index 4db5a8c23a4..6ac498eae26 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc @@ -111,9 +111,9 @@ static void extract_weights_init(const MeshRenderData *mr, } } -static void extract_weights_iter_poly_bm(const MeshRenderData *UNUSED(mr), +static void extract_weights_iter_poly_bm(const MeshRenderData * /*mr*/, const BMFace *f, - const int UNUSED(f_index), + const int /*f_index*/, void *_data) { MeshExtract_Weight_Data *data = static_cast<MeshExtract_Weight_Data *>(_data); @@ -134,7 +134,7 @@ static void extract_weights_iter_poly_bm(const MeshRenderData *UNUSED(mr), static void extract_weights_iter_poly_mesh(const MeshRenderData *mr, const MPoly *mp, - const int UNUSED(mp_index), + const int /*mp_index*/, void *_data) { MeshExtract_Weight_Data *data = static_cast<MeshExtract_Weight_Data *>(_data); |