blender
/
blender
126
393
Fork 565
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Cleanup: Remove unused argument, unnecessary struct keyword

This commit is contained in:
Hans Goudey 2022-06-18 13:08:15 +02:00
parent 30f244d96f
commit ac4836af6a
30 changed files with 95 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/intern/draw_cache_extract_mesh.cc
View File

@ -155,7 +155,7 @@ struct ExtractTaskData {
bool use_threading = false;
ExtractTaskData(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
ExtractorRunDatas *extractors,
MeshBufferList *mbuflist,
const bool use_threading)
@ -193,7 +193,7 @@ static void extract_task_data_free(void *data)
* \{ */
BLI_INLINE void extract_init(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
ExtractorRunDatas &extractors,
MeshBufferList *mbuflist,
void *data_stack)
@ -209,7 +209,7 @@ BLI_INLINE void extract_init(const MeshRenderData *mr,
}
BLI_INLINE void extract_finish(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
const ExtractorRunDatas &extractors,
void *data_stack)
{

4
source/blender/draw/intern/draw_cache_impl_subdivision.cc
View File

@ -2004,7 +2004,7 @@ static void draw_subdiv_cache_ensure_mat_offsets(DRWSubdivCache *cache,
static bool draw_subdiv_create_requested_buffers(Object *ob,
Mesh *mesh,
struct MeshBatchCache *batch_cache,
MeshBatchCache *batch_cache,
MeshBufferCache *mbc,
const bool is_editmode,
const bool is_paint_mode,
@ -2195,7 +2195,7 @@ static OpenSubdiv_EvaluatorCache *g_evaluator_cache = nullptr;
void DRW_create_subdivision(Object *ob,
Mesh *mesh,
struct MeshBatchCache *batch_cache,
MeshBatchCache *batch_cache,
MeshBufferCache *mbc,
const bool is_editmode,
const bool is_paint_mode,

22
source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_edituv.cc
View File

@ -22,7 +22,7 @@ struct MeshExtract_EditUvElem_Data {
};
static void extract_edituv_tris_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(ibo),
void *tls_data)
{
@ -69,7 +69,7 @@ static void extract_edituv_tris_iter_looptri_mesh(const MeshRenderData *mr,
}
static void extract_edituv_tris_finish(const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_data)
{
@ -142,7 +142,7 @@ static void extract_edituv_tris_iter_subdiv_mesh(const DRWSubdivCache *UNUSED(su
static void extract_edituv_tris_finish_subdiv(const struct DRWSubdivCache *UNUSED(subdiv_cache),
const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_data)
{
@ -176,7 +176,7 @@ constexpr MeshExtract create_extractor_edituv_tris()
* \{ */
static void extract_edituv_lines_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(ibo),
void *tls_data)
{
@ -236,7 +236,7 @@ static void extract_edituv_lines_iter_poly_mesh(const MeshRenderData *mr,
}
static void extract_edituv_lines_finish(const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_data)
{
@ -307,7 +307,7 @@ 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),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_data)
{
@ -341,7 +341,7 @@ constexpr MeshExtract create_extractor_edituv_lines()
* \{ */
static void extract_edituv_points_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(ibo),
void *tls_data)
{
@ -394,7 +394,7 @@ static void extract_edituv_points_iter_poly_mesh(const MeshRenderData *mr,
}
static void extract_edituv_points_finish(const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_data)
{
@ -459,7 +459,7 @@ 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),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_data)
{
@ -493,7 +493,7 @@ constexpr MeshExtract create_extractor_edituv_points()
* \{ */
static void extract_edituv_fdots_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(ibo),
void *tls_data)
{
@ -557,7 +557,7 @@ static void extract_edituv_fdots_iter_poly_mesh(const MeshRenderData *mr,
}
static void extract_edituv_fdots_finish(const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_data)
{

4
source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_fdots.cc
View File

@ -15,7 +15,7 @@ namespace blender::draw {
* \{ */
static void extract_fdots_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(buf),
void *tls_data)
{
@ -68,7 +68,7 @@ static void extract_fdots_iter_poly_mesh(const MeshRenderData *mr,
}
static void extract_fdots_finish(const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_userdata)
{

16
source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines.cc
View File

@ -18,7 +18,7 @@ namespace blender::draw {
* \{ */
static void extract_lines_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(buf),
void *tls_data)
{
@ -132,7 +132,7 @@ static void extract_lines_task_reduce(void *_userdata_to, void *_userdata_from)
}
static void extract_lines_finish(const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *data)
{
@ -143,7 +143,7 @@ static void extract_lines_finish(const MeshRenderData *UNUSED(mr),
static void extract_lines_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buffer,
void *UNUSED(data))
{
@ -229,7 +229,7 @@ constexpr MeshExtract create_extractor_lines()
/** \name Extract Lines and Loose Edges Sub Buffer
* \{ */
static void extract_lines_loose_subbuffer(const MeshRenderData *mr, struct MeshBatchCache *cache)
static void extract_lines_loose_subbuffer(const MeshRenderData *mr, MeshBatchCache *cache)
{
BLI_assert(cache->final.buff.ibo.lines);
/* Multiply by 2 because these are edges indices. */
@ -241,7 +241,7 @@ static void extract_lines_loose_subbuffer(const MeshRenderData *mr, struct MeshB
}
static void extract_lines_with_lines_loose_finish(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *data)
{
@ -253,7 +253,7 @@ 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),
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *UNUSED(buf),
void *UNUSED(_data))
{
@ -292,7 +292,7 @@ constexpr MeshExtract create_extractor_lines_with_lines_loose()
* \{ */
static void extract_lines_loose_only_init(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *UNUSED(tls_data))
{
@ -303,7 +303,7 @@ static void extract_lines_loose_only_init(const MeshRenderData *mr,
static void extract_lines_loose_only_init_subdiv(const DRWSubdivCache *UNUSED(subdiv_cache),
const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *UNUSED(data))
{

8
source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_adjacency.cc
View File

@ -42,7 +42,7 @@ static void line_adjacency_data_init(MeshExtract_LineAdjacency_Data *data,
}
static void extract_lines_adjacency_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(buf),
void *tls_data)
{
@ -132,7 +132,7 @@ static void extract_lines_adjacency_iter_looptri_mesh(const MeshRenderData *mr,
}
static void extract_lines_adjacency_finish(const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *_data)
{
@ -166,7 +166,7 @@ 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),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(buf),
void *_data)
{
@ -222,7 +222,7 @@ static void extract_lines_adjacency_iter_subdiv_mesh(const DRWSubdivCache *subdi
static void extract_lines_adjacency_finish_subdiv(const DRWSubdivCache *UNUSED(subdiv_cache),
const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *_data)
{

6
source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_lines_paint_mask.cc
View File

@ -26,7 +26,7 @@ struct MeshExtract_LinePaintMask_Data {
};
static void extract_lines_paint_mask_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(ibo),
void *tls_data)
{
@ -78,7 +78,7 @@ static void extract_lines_paint_mask_iter_poly_mesh(const MeshRenderData *mr,
}
static void extract_lines_paint_mask_finish(const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_data)
{
@ -154,7 +154,7 @@ 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,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *_data)
{

8
source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
View File

@ -19,7 +19,7 @@ namespace blender::draw {
* \{ */
static void extract_points_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(buf),
void *tls_data)
{
@ -131,7 +131,7 @@ static void extract_points_task_reduce(void *_userdata_to, void *_userdata_from)
}
static void extract_points_finish(const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_userdata)
{
@ -142,7 +142,7 @@ static void extract_points_finish(const MeshRenderData *UNUSED(mr),
static void extract_points_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(buffer),
void *data)
{
@ -285,7 +285,7 @@ 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),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_userdata)
{

10
source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_tris.cc
View File

@ -25,7 +25,7 @@ static void extract_tris_mat_task_reduce(void *_userdata_to, void *_userdata_fro
* \{ */
static void extract_tris_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(ibo),
void *tls_data)
{
@ -81,7 +81,7 @@ static void extract_tris_iter_poly_mesh(const MeshRenderData *mr,
}
static void extract_tris_finish(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *_data)
{
@ -111,7 +111,7 @@ static void extract_tris_finish(const MeshRenderData *mr,
static void extract_tris_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *UNUSED(data))
{
@ -157,7 +157,7 @@ constexpr MeshExtract create_extractor_tris()
* \{ */
static void extract_tris_single_mat_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(ibo),
void *tls_data)
{
@ -199,7 +199,7 @@ static void extract_tris_single_mat_iter_looptri_mesh(const MeshRenderData *mr,
}
static void extract_tris_single_mat_finish(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *_data)
{

18
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc
View File

@ -120,8 +120,7 @@ static GPUVertCompType get_comp_type_for_type(eCustomDataType type)
}
}
static void init_vbo_for_attribute(const MeshRenderData *mr,
GPUVertBuf *vbo,
static void init_vbo_for_attribute(GPUVertBuf *vbo,
const DRW_AttributeRequest &request,
bool build_on_device,
uint32_t len)
@ -255,18 +254,15 @@ static void extract_attr_generic(const MeshRenderData *mr,
}
}
static void extract_attr_init(const MeshRenderData *mr,
struct MeshBatchCache *cache,
void *buf,
void *UNUSED(tls_data),
int index)
static void extract_attr_init(
const MeshRenderData *mr, MeshBatchCache *cache, void *buf, void *UNUSED(tls_data), int index)
{
const DRW_Attributes *attrs_used = &cache->attr_used;
const DRW_AttributeRequest &request = attrs_used->requests[index];
GPUVertBuf *vbo = static_cast<GPUVertBuf *>(buf);
init_vbo_for_attribute(mr, vbo, request, false, static_cast<uint32_t>(mr->loop_len));
init_vbo_for_attribute(vbo, request, false, static_cast<uint32_t>(mr->loop_len));
/* TODO(@kevindietrich): float3 is used for scalar attributes as the implicit conversion done by
* OpenGL to vec4 for a scalar `s` will produce a `vec4(s, 0, 0, 1)`. However, following the
@ -347,7 +343,7 @@ static void extract_attr_init_subdiv(const DRWSubdivCache *subdiv_cache,
}
GPUVertBuf *dst_buffer = static_cast<GPUVertBuf *>(buffer);
init_vbo_for_attribute(mr, dst_buffer, request, true, subdiv_cache->num_subdiv_loops);
init_vbo_for_attribute(dst_buffer, request, true, subdiv_cache->num_subdiv_loops);
/* Ensure data is uploaded properly. */
GPU_vertbuf_tag_dirty(src_data);
@ -361,13 +357,13 @@ static void extract_attr_init_subdiv(const DRWSubdivCache *subdiv_cache,
* extract. The overall API does not allow us to pass this in a convenient way. */
#define EXTRACT_INIT_WRAPPER(index) \
static void extract_attr_init##index( \
const MeshRenderData *mr, struct MeshBatchCache *cache, void *buf, void *tls_data) \
const MeshRenderData *mr, MeshBatchCache *cache, void *buf, void *tls_data) \
{ \
extract_attr_init(mr, cache, buf, tls_data, index); \
} \
static void extract_attr_init_subdiv##index(const DRWSubdivCache *subdiv_cache, \
const MeshRenderData *mr, \
struct MeshBatchCache *cache, \
MeshBatchCache *cache, \
void *buf, \
void *tls_data) \
{ \

6
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc
View File

@ -43,7 +43,7 @@ static float loop_edge_factor_get(const float f_no[3],
}
static void extract_edge_fac_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_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,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *_data)
{
@ -218,7 +218,7 @@ static GPUVertFormat *get_subdiv_edge_fac_format()
static void extract_edge_fac_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *UNUSED(data))
{

2
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edit_data.cc
View File

@ -112,7 +112,7 @@ static GPUVertFormat *get_edit_data_format()
}
static void extract_edit_data_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{

2
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_data.cc
View File

@ -43,7 +43,7 @@ static void extract_edituv_data_init_common(const MeshRenderData *mr,
}
static void extract_edituv_data_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{

4
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_angle.cc
View File

@ -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,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{
@ -212,7 +212,7 @@ static GPUVertFormat *get_edituv_stretch_angle_format_subdiv()
static void extract_edituv_stretch_angle_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *UNUSED(tls_data))
{

6
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_edituv_stretch_area.cc
View File

@ -20,7 +20,7 @@ namespace blender::draw {
* \{ */
static void extract_edituv_stretch_area_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *UNUSED(tls_data))
{
@ -89,7 +89,7 @@ static void compute_area_ratio(const MeshRenderData *mr,
}
static void extract_edituv_stretch_area_finish(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *UNUSED(data))
{
@ -131,7 +131,7 @@ static void extract_edituv_stretch_area_finish(const MeshRenderData *mr,
static void extract_edituv_stretch_area_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *UNUSED(data))
{

2
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_edituv_data.cc
View File

@ -21,7 +21,7 @@ struct MeshExtract_EditUVFdotData_Data {
};
static void extract_fdots_edituv_data_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{

8
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_nor.cc
View File

@ -19,7 +19,7 @@ namespace blender::draw {
#define NOR_AND_FLAG_HIDDEN -2
static void extract_fdots_nor_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *UNUSED(tls_data))
{
@ -34,7 +34,7 @@ static void extract_fdots_nor_init(const MeshRenderData *mr,
}
static void extract_fdots_nor_finish(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *UNUSED(data))
{
@ -101,7 +101,7 @@ constexpr MeshExtract create_extractor_fdots_nor()
* \{ */
static void extract_fdots_nor_hq_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *UNUSED(tls_data))
{
@ -116,7 +116,7 @@ static void extract_fdots_nor_hq_init(const MeshRenderData *mr,
}
static void extract_fdots_nor_hq_finish(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *UNUSED(data))
{

4
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_pos.cc
View File

@ -36,7 +36,7 @@ static GPUVertFormat *get_fdots_nor_format_subdiv()
}
static void extract_fdots_pos_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{
@ -101,7 +101,7 @@ 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),
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *UNUSED(data))
{

2
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc
View File

@ -22,7 +22,7 @@ struct MeshExtract_FdotUV_Data {
};
static void extract_fdots_uv_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{

6
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc
View File

@ -16,7 +16,7 @@ namespace blender::draw {
* \{ */
static void extract_lnor_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{
@ -105,7 +105,7 @@ static GPUVertFormat *get_subdiv_lnor_format()
static void extract_lnor_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *UNUSED(data))
{
@ -141,7 +141,7 @@ struct gpuHQNor {
};
static void extract_lnor_hq_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{

4
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_mesh_analysis.cc
View File

@ -23,7 +23,7 @@ namespace blender::draw {
* \{ */
static void extract_mesh_analysis_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *UNUSED(tls_data))
{
@ -587,7 +587,7 @@ static void statvis_calc_sharp(const MeshRenderData *mr, float *r_sharp)
}
static void extract_analysis_iter_finish_mesh(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *UNUSED(data))
{

2
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc
View File

@ -19,7 +19,7 @@ struct MeshExtract_Orco_Data {
};
static void extract_orco_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{

10
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc
View File

@ -28,7 +28,7 @@ struct MeshExtract_PosNor_Data {
};
static void extract_pos_nor_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{
@ -171,7 +171,7 @@ static void extract_pos_nor_iter_lvert_mesh(const MeshRenderData *mr,
}
static void extract_pos_nor_finish(const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(buf),
void *_data)
{
@ -201,7 +201,7 @@ static GPUVertFormat *get_custom_normals_format()
static void extract_pos_nor_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *UNUSED(data))
{
@ -372,7 +372,7 @@ struct MeshExtract_PosNorHQ_Data {
};
static void extract_pos_nor_hq_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{
@ -521,7 +521,7 @@ static void extract_pos_nor_hq_iter_lvert_mesh(const MeshRenderData *mr,
}
static void extract_pos_nor_hq_finish(const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *UNUSED(buf),
void *_data)
{

4
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_sculpt_data.cc
View File

@ -31,7 +31,7 @@ static GPUVertFormat *get_sculpt_data_format()
}
static void extract_sculpt_data_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *UNUSED(tls_data))
{
@ -113,7 +113,7 @@ static void extract_sculpt_data_init(const MeshRenderData *mr,
static void extract_sculpt_data_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buffer,
void *UNUSED(data))
{

4
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_select_idx.cc
View File

@ -30,7 +30,7 @@ static void extract_select_idx_init_impl(const MeshRenderData *UNUSED(mr),
}
static void extract_select_idx_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{
@ -366,7 +366,7 @@ constexpr MeshExtract create_extractor_vert_idx()
}
static void extract_fdot_idx_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *tls_data)
{

2
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_skin_roots.cc
View File

@ -19,7 +19,7 @@ struct SkinRootData {
};
static void extract_skin_roots_init(const MeshRenderData *mr,
struct MeshBatchCache *UNUSED(cache),
MeshBatchCache *UNUSED(cache),
void *buf,
void *UNUSED(tls_data))
{

10
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_tan.cc
View File

@ -25,7 +25,7 @@ namespace blender::draw {
* \{ */
static void extract_tan_init_common(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
GPUVertFormat *format,
GPUVertCompType comp_type,
GPUVertFetchMode fetch_mode,
@ -161,7 +161,7 @@ static void extract_tan_init_common(const MeshRenderData *mr,
}
static void extract_tan_ex_init(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
GPUVertBuf *vbo,
const bool do_hq)
{
@ -235,7 +235,7 @@ static void extract_tan_ex_init(const MeshRenderData *mr,
}
static void extract_tan_init(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *UNUSED(tls_data))
{
@ -254,7 +254,7 @@ static GPUVertFormat *get_coarse_tan_format()
static void extract_tan_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *UNUSED(data))
{
@ -344,7 +344,7 @@ constexpr MeshExtract create_extractor_tan()
* \{ */
static void extract_tan_hq_init(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *UNUSED(tls_data))
{

6
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_uv.cc
View File

@ -19,7 +19,7 @@ namespace blender::draw {
/* Initialize the vertex format to be used for UVs. Return true if any UV layer is
* found, false otherwise. */
static bool mesh_extract_uv_format_init(GPUVertFormat *format,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
CustomData *cd_ldata,
eMRExtractType extract_type,
uint32_t &r_uv_layers)
@ -72,7 +72,7 @@ static bool mesh_extract_uv_format_init(GPUVertFormat *format,
}
static void extract_uv_init(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *UNUSED(tls_data))
{
@ -120,7 +120,7 @@ static void extract_uv_init(const MeshRenderData *mr,
static void extract_uv_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *UNUSED(mr),
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *UNUSED(data))
{

4
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc
View File

@ -123,7 +123,7 @@ struct gpuMeshVcol {
};
static void extract_vcol_init(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *UNUSED(tls_data))
{
@ -234,7 +234,7 @@ static void extract_vcol_init(const MeshRenderData *mr,
static void extract_vcol_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *UNUSED(data))
{

4
source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_weights.cc
View File

@ -79,7 +79,7 @@ static float evaluate_vertex_weight(const MDeformVert *dvert, const DRW_MeshWeig
}
static void extract_weights_init(const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buf,
void *tls_data)
{
@ -154,7 +154,7 @@ static void extract_weights_iter_poly_mesh(const MeshRenderData *mr,
static void extract_weights_init_subdiv(const DRWSubdivCache *subdiv_cache,
const MeshRenderData *mr,
struct MeshBatchCache *cache,
MeshBatchCache *cache,
void *buffer,
void *_data)
{