From fd1fec5600287cd47e5fcf0affe16d712ba85fbe Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 1 Jul 2021 16:33:07 -0500 Subject: Cleanup: Clang tidy, remove typedef --- .../intern/mesh_extractors/extract_mesh_vbo_edge_fac.cc | 4 ++-- .../mesh_extractors/extract_mesh_vbo_edituv_data.cc | 4 ++-- .../extract_mesh_vbo_edituv_stretch_angle.cc | 8 ++++---- .../extract_mesh_vbo_fdots_edituv_data.cc | 4 ++-- .../intern/mesh_extractors/extract_mesh_vbo_fdots_uv.cc | 4 ++-- .../draw/intern/mesh_extractors/extract_mesh_vbo_lnor.cc | 4 ++-- .../draw/intern/mesh_extractors/extract_mesh_vbo_orco.cc | 4 ++-- .../intern/mesh_extractors/extract_mesh_vbo_pos_nor.cc | 16 ++++++++-------- .../mesh_extractors/extract_mesh_vbo_sculpt_data.cc | 4 ++-- .../mesh_extractors/extract_mesh_vbo_skin_roots.cc | 4 ++-- .../intern/mesh_extractors/extract_mesh_vbo_weights.cc | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) 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 7033a2b509a..1bc4c7e330f 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 @@ -34,12 +34,12 @@ namespace blender::draw { * Defines how much an edge is visible. * \{ */ -typedef struct MeshExtract_EdgeFac_Data { +struct MeshExtract_EdgeFac_Data { uchar *vbo_data; bool use_edge_render; /* Number of loop per edge. */ uchar *edge_loop_count; -} MeshExtract_EdgeFac_Data; +}; static float loop_edge_factor_get(const float f_no[3], const float v_co[3], 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 d4a72000fc1..aa58266d56b 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 @@ -30,10 +30,10 @@ namespace blender::draw { /** \name Extract Edit UV Data / Flags * \{ */ -typedef struct MeshExtract_EditUVData_Data { +struct MeshExtract_EditUVData_Data { EditLoopData *vbo_data; int cd_ofs; -} MeshExtract_EditUVData_Data; +}; static void extract_edituv_data_init(const MeshRenderData *mr, struct MeshBatchCache *UNUSED(cache), 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 63b52a4ad9a..1d62637d172 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 @@ -33,18 +33,18 @@ namespace blender::draw { /** \name Extract Edit UV angle stretch * \{ */ -typedef struct UVStretchAngle { +struct UVStretchAngle { int16_t angle; int16_t uv_angles[2]; -} UVStretchAngle; +}; -typedef struct MeshExtract_StretchAngle_Data { +struct MeshExtract_StretchAngle_Data { UVStretchAngle *vbo_data; MLoopUV *luv; float auv[2][2], last_auv[2]; float av[2][3], last_av[3]; int cd_ofs; -} MeshExtract_StretchAngle_Data; +}; static void compute_normalize_edge_vectors(float auv[2][2], float av[2][3], 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 dc77f83b30b..5a988c73a7e 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 @@ -30,10 +30,10 @@ namespace blender::draw { /** \name Extract Face-dots Edit UV flag * \{ */ -typedef struct MeshExtract_EditUVFdotData_Data { +struct MeshExtract_EditUVFdotData_Data { EditLoopData *vbo_data; int cd_ofs; -} MeshExtract_EditUVFdotData_Data; +}; static void extract_fdots_edituv_data_init(const MeshRenderData *mr, struct MeshBatchCache *UNUSED(cache), 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 1adfe9d00de..0289fd63a30 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 @@ -29,11 +29,11 @@ namespace blender::draw { /** \name Extract Face-dots UV * \{ */ -typedef struct MeshExtract_FdotUV_Data { +struct MeshExtract_FdotUV_Data { float (*vbo_data)[2]; MLoopUV *uv_data; int cd_ofs; -} MeshExtract_FdotUV_Data; +}; static void extract_fdots_uv_init(const MeshRenderData *mr, struct MeshBatchCache *UNUSED(cache), 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 6823cb6e8d0..b942068352b 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 @@ -125,9 +125,9 @@ constexpr MeshExtract create_extractor_lnor() /** \name Extract HQ Loop Normal * \{ */ -typedef struct gpuHQNor { +struct gpuHQNor { short x, y, z, w; -} gpuHQNor; +}; static void extract_lnor_hq_init(const MeshRenderData *mr, struct MeshBatchCache *UNUSED(cache), 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 933cf698368..80b73cac678 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 @@ -29,10 +29,10 @@ namespace blender::draw { /** \name Extract Orco * \{ */ -typedef struct MeshExtract_Orco_Data { +struct MeshExtract_Orco_Data { float (*vbo_data)[4]; float (*orco)[3]; -} MeshExtract_Orco_Data; +}; static void extract_orco_init(const MeshRenderData *mr, struct MeshBatchCache *UNUSED(cache), 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 01212935b87..2ac926dd257 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 @@ -31,15 +31,15 @@ namespace blender::draw { /** \name Extract Position and Vertex Normal * \{ */ -typedef struct PosNorLoop { +struct PosNorLoop { float pos[3]; GPUPackedNormal nor; -} PosNorLoop; +}; -typedef struct MeshExtract_PosNor_Data { +struct MeshExtract_PosNor_Data { PosNorLoop *vbo_data; GPUNormal *normals; -} MeshExtract_PosNor_Data; +}; static void extract_pos_nor_init(const MeshRenderData *mr, struct MeshBatchCache *UNUSED(cache), @@ -218,15 +218,15 @@ constexpr MeshExtract create_extractor_pos_nor() /** \name Extract Position and High Quality Vertex Normal * \{ */ -typedef struct PosNorHQLoop { +struct PosNorHQLoop { float pos[3]; short nor[4]; -} PosNorHQLoop; +}; -typedef struct MeshExtract_PosNorHQ_Data { +struct MeshExtract_PosNorHQ_Data { PosNorHQLoop *vbo_data; GPUNormal *normals; -} MeshExtract_PosNorHQ_Data; +}; static void extract_pos_nor_hq_init(const MeshRenderData *mr, struct MeshBatchCache *UNUSED(cache), 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 27bc94b0d85..7b36a009419 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 @@ -58,10 +58,10 @@ static void extract_sculpt_data_init(const MeshRenderData *mr, GPU_vertbuf_init_with_format(vbo, &format); GPU_vertbuf_data_alloc(vbo, mr->loop_len); - typedef struct gpuSculptData { + struct gpuSculptData { uint8_t face_set_color[4]; float mask; - } gpuSculptData; + }; gpuSculptData *vbo_data = (gpuSculptData *)GPU_vertbuf_get_data(vbo); MLoop *loops = (MLoop *)CustomData_get_layer(cd_ldata, CD_MLOOP); 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 3a3006f3f32..d7a01ee607f 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 @@ -29,10 +29,10 @@ namespace blender::draw { /** \name Extract Skin Modifier Roots * \{ */ -typedef struct SkinRootData { +struct SkinRootData { float size; float local_pos[3]; -} SkinRootData; +}; static void extract_skin_roots_init(const MeshRenderData *mr, struct MeshBatchCache *UNUSED(cache), 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 7a285434a66..aae266eadce 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 @@ -33,12 +33,12 @@ namespace blender::draw { /** \name Extract Vertex Weight * \{ */ -typedef struct MeshExtract_Weight_Data { +struct MeshExtract_Weight_Data { float *vbo_data; const DRW_MeshWeightState *wstate; const MDeformVert *dvert; /* For #Mesh. */ int cd_ofs; /* For #BMesh. */ -} MeshExtract_Weight_Data; +}; static float evaluate_vertex_weight(const MDeformVert *dvert, const DRW_MeshWeightState *wstate) { -- cgit v1.2.3