Cleanup: unused structs, struct members
authorCampbell Barton <ideasman42@gmail.com>
Wed, 2 Oct 2019 21:39:45 +0000 (07:39 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 2 Oct 2019 21:39:45 +0000 (07:39 +1000)
19 files changed:
intern/mikktspace/mikktspace.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenlib/intern/BLI_timer.c
source/blender/draw/engines/basic/basic_engine.c
source/blender/draw/engines/eevee/eevee_lightprobes.c
source/blender/draw/engines/eevee/eevee_occlusion.c
source/blender/draw/engines/eevee/eevee_screen_raytrace.c
source/blender/draw/engines/eevee/eevee_volumes.c
source/blender/draw/engines/workbench/workbench_deferred.c
source/blender/draw/engines/workbench/workbench_volume.c
source/blender/draw/intern/draw_armature.c
source/blender/draw/intern/draw_cache.c
source/blender/draw/intern/draw_common.c
source/blender/draw/intern/draw_manager_data.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/gpu/intern/gpu_batch_utils.c
source/blender/imbuf/intern/imageprocess.c

index ab58c8f48e48b47b82a2decad3f4cd75bc8ece77..4f120b7d83c950bbae6844207047ca620f6b752a 100644 (file)
@@ -460,11 +460,6 @@ tbool genTangSpace(const SMikkTSpaceContext *pContext, const float fAngularThres
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-typedef struct {
-  float vert[3];
-  int index;
-} STmpVert;
-
 static void GenerateSharedVerticesIndexListSlow(int piTriList_in_and_out[],
                                                 const SMikkTSpaceContext *pContext,
                                                 const int iNrTrianglesIn);
index f67bc419210f52c7fcbeea11619a3423e62a0016..9385a9ae24d708411a84b8b7d36d6aad9337f6d8 100644 (file)
@@ -409,8 +409,8 @@ typedef struct MovieClipCache {
 
     /* cache for undistorted shot */
     float principal[2];
-    float polynomial_k1, polynomial_k2, polynomial_k3;
-    float division_k1, division_k2;
+    float polynomial_k1;
+    float division_k1;
     short distortion_model;
     bool undistortion_used;
 
index 0443dea9a2ea19917bb3e5db392c0dcc06460e6a..af987587d9033c344ad1917f33f658b029c9fef0 100644 (file)
@@ -42,7 +42,6 @@ typedef struct TimedFunction {
 
 typedef struct TimerContainer {
   ListBase funcs;
-  bool file_load_cb_registered;
 } TimerContainer;
 
 static TimerContainer GlobalTimer = {{0}};
index 188e252a285714dd6d38b111780337312bc53cd6..0dd1a4fd6861badf3a7fc2090624d8c11a66ebaa 100644 (file)
@@ -72,7 +72,6 @@ static struct {
 typedef struct BASIC_PrivateData {
   DRWShadingGroup *depth_shgrp;
   DRWShadingGroup *depth_shgrp_cull;
-  DRWShadingGroup *depth_shgrp_hair;
 } BASIC_PrivateData; /* Transient data */
 
 /* Functions */
index 19f3983998ed684ff6e6b2161730a1fa7720b469..4b0af273f7fcf645f91b51dd07da074d34c921bb 100644 (file)
@@ -51,7 +51,6 @@ static struct {
   struct GPUTexture *planar_pool_placeholder;
   struct GPUTexture *depth_placeholder;
   struct GPUTexture *depth_array_placeholder;
-  struct GPUTexture *cube_face_minmaxz;
 
   struct GPUVertFormat *format_probe_display_cube;
   struct GPUVertFormat *format_probe_display_planar;
index 924b3d3b19b99502d5417878d41917344e7818f6..c60aa173b489a924b460fcdcea37a47f216488bb 100644 (file)
@@ -40,7 +40,6 @@ static struct {
   struct GPUShader *gtao_sh;
   struct GPUShader *gtao_layer_sh;
   struct GPUShader *gtao_debug_sh;
-  struct GPUTexture *src_depth;
 
   struct GPUTexture *dummy_horizon_tx;
 } e_data = {NULL}; /* Engine data */
index 2daf2388d63ffa78423310a4492f6417e7b8a383..591ca31017c8cbfb0c29858fef12f69b2c291033 100644 (file)
@@ -46,7 +46,6 @@ static struct {
 
   /* These are just references, not actually allocated */
   struct GPUTexture *depth_src;
-  struct GPUTexture *color_src;
 } e_data = {{NULL}}; /* Engine data */
 
 extern char datatoc_ambient_occlusion_lib_glsl[];
index fac87bad41abcd63edb6586b7d89c2160c45e53a..aaa351a19224e2ab451852d6bcc3e3c6a1aa5d0b 100644 (file)
@@ -54,7 +54,6 @@ static struct {
   struct GPUShader *volumetric_integration_sh;
   struct GPUShader *volumetric_resolve_sh;
 
-  GPUTexture *color_src;
   GPUTexture *depth_src;
 
   GPUTexture *dummy_density;
index 15522ba0dfb76199e5ee5c97c7d0eb60b24a27b5..2e8b952f234801ac1684600ae50dfb1eda2a4924 100644 (file)
@@ -78,7 +78,6 @@ static struct {
   struct GPUTexture *object_id_tx;        /* ref only, not alloced */
   struct GPUTexture *color_buffer_tx;     /* ref only, not alloced */
   struct GPUTexture *cavity_buffer_tx;    /* ref only, not alloced */
-  struct GPUTexture *metallic_buffer_tx;  /* ref only, not alloced */
   struct GPUTexture *normal_buffer_tx;    /* ref only, not alloced */
   struct GPUTexture *composite_buffer_tx; /* ref only, not alloced */
 
index e017661b6cdda0c4265b9fc78915e730f32c8161..23f0898c13808aadb3d1b9b3110e4b69d6d1ad15 100644 (file)
@@ -46,8 +46,6 @@ enum {
 static struct {
   struct GPUShader *volume_sh[VOLUME_SH_MAX];
   struct GPUShader *volume_coba_sh;
-  struct GPUShader *volume_slice_sh;
-  struct GPUShader *volume_slice_coba_sh;
   struct GPUTexture *dummy_tex;
   struct GPUTexture *dummy_coba_tex;
 } e_data = {{NULL}};
index 865cfea14e3ee25a397a0cc7feccf2f3295ccf2b..5cd6a4a12866e3193288bb3d5927ea47c67068bc 100644 (file)
@@ -60,7 +60,6 @@ static struct {
   Object *ob;
   /* Reset when changing current_armature */
   DRWCallBuffer *bone_octahedral_solid;
-  DRWCallBuffer *bone_octahedral_wire;
   DRWCallBuffer *bone_octahedral_outline;
   DRWCallBuffer *bone_box_solid;
   DRWCallBuffer *bone_box_wire;
index 019098e5b90716149696ff0f59c696b9e1c629fd..b085d402e817b994d5492ee3c3e8689d3f3b82d2 100644 (file)
@@ -53,7 +53,6 @@ static struct DRWShapeCache {
   GPUBatch *drw_cursor;
   GPUBatch *drw_cursor_only_circle;
   GPUBatch *drw_fullscreen_quad;
-  GPUBatch *drw_fullscreen_quad_texcoord;
   GPUBatch *drw_quad;
   GPUBatch *drw_quad_wires;
   GPUBatch *drw_grid;
@@ -72,8 +71,6 @@ static struct DRWShapeCache {
   GPUBatch *drw_empty_capsule_body;
   GPUBatch *drw_empty_capsule_cap;
   GPUBatch *drw_empty_cone;
-  GPUBatch *drw_arrows;
-  GPUBatch *drw_axis_names;
   GPUBatch *drw_image_plane;
   GPUBatch *drw_image_plane_wire;
   GPUBatch *drw_field_wind;
@@ -99,7 +96,6 @@ static struct DRWShapeCache {
   GPUBatch *drw_bone_octahedral_wire;
   GPUBatch *drw_bone_box;
   GPUBatch *drw_bone_box_wire;
-  GPUBatch *drw_bone_wire_wire;
   GPUBatch *drw_bone_envelope;
   GPUBatch *drw_bone_envelope_outline;
   GPUBatch *drw_bone_point;
@@ -111,7 +107,6 @@ static struct DRWShapeCache {
   GPUBatch *drw_camera;
   GPUBatch *drw_camera_frame;
   GPUBatch *drw_camera_tria;
-  GPUBatch *drw_camera_focus;
   GPUBatch *drw_particle_cross;
   GPUBatch *drw_particle_circle;
   GPUBatch *drw_particle_axis;
index 7f679dd5581642df953f87c618a72e18548a888f..988859c64a5fc7712c7b8d40f83b7f175cbfe781 100644 (file)
@@ -277,7 +277,6 @@ static struct {
   struct GPUVertFormat *instance_scaled;
   struct GPUVertFormat *instance_sized;
   struct GPUVertFormat *instance_outline;
-  struct GPUVertFormat *instance;
   struct GPUVertFormat *instance_camera;
   struct GPUVertFormat *instance_distance_lines;
   struct GPUVertFormat *instance_spot;
index dcf526679bf761b6075d6f98329abd843e96de3e..330f72eda18a234d585e06dc13b46d4251c536f3 100644 (file)
@@ -1846,11 +1846,6 @@ void DRW_pass_foreach_shgroup(DRWPass *pass,
   }
 }
 
-typedef struct ZSortData {
-  const float *axis;
-  const float *origin;
-} ZSortData;
-
 static int pass_shgroup_dist_sort(const void *a, const void *b)
 {
   const DRWShadingGroup *shgrp_a = (const DRWShadingGroup *)a;
index b844e2373664b259191849f979fa33c55435159b..1495fb7e716dd83e4db7cd0ca7527843b703a283 100644 (file)
@@ -1583,7 +1583,6 @@ static struct {
   IconTextureDrawCall normal;
   IconTextureDrawCall border;
   bool enabled;
-  float mat[4][4];
 } g_icon_draw_cache = {{{{{0}}}}};
 
 void UI_icon_draw_cache_begin(void)
index 7155348fed5677a614dbdffe2c29b78600a354ed..993898bddd5dd7521c3627b907bc6ab2a16113a3 100644 (file)
@@ -522,7 +522,6 @@ typedef struct GizmoGroupData_SpinRedo {
     PropertyRNA *prop_axis_no;
     PropertyRNA *prop_angle;
 
-    float rotate_axis[3];
 #ifdef USE_ANGLE_Z_ORIENT
     /* Apply 'orient_mat' for the final value. */
     float orient_axis_relative[3];
index 3554a6cc546c0829e81d6eef0dffccc84ee5a8a9..81e3f04a0d12dc6f31ba6a91cee0e0f21c9c2697 100644 (file)
@@ -2587,11 +2587,6 @@ void PAINT_OT_vertex_paint_toggle(wmOperatorType *ot)
  * - revise whether op->customdata should be added in object, in set_vpaint
  */
 
-typedef struct PolyFaceMap {
-  struct PolyFaceMap *next, *prev;
-  int facenr;
-} PolyFaceMap;
-
 struct VPaintData {
   ViewContext vc;
   struct NormalAnglePrecalc normal_angle_precalc;
index 3a8b392ef1d8353507bc979921b9e90480e6c518..825f72e175be4d745c371f88298347713544cc50 100644 (file)
@@ -164,7 +164,6 @@ GPUBatch *GPU_batch_wire_from_poly_2d_encoded(const uchar *polys_flat,
       BLI_assert(polys_step_len >= 2);
       for (uint i_prev = polys_step_len - 1, i = 0; i < polys_step_len; i_prev = i++) {
         union {
-          uint8_t as_u8[4];
           uint16_t as_u16[2];
           uint32_t as_u32;
         } data;
index 49e9c4c54d2b07b2ae0e6264bc42d5d26c80fc39..ec03a0a07b8f6ca360ef52dc51ffed34bab8546a 100644 (file)
@@ -401,11 +401,6 @@ typedef struct ScanlineGlobalData {
   int total_scanlines;
 } ScanlineGlobalData;
 
-typedef struct ScanlineTask {
-  int start_scanline;
-  int num_scanlines;
-} ScanlineTask;
-
 static void processor_apply_scanline_func(TaskPool *__restrict pool,
                                           void *taskdata,
                                           int UNUSED(threadid))