blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Cleanup: unused structs, struct members

This commit is contained in:
Campbell Barton 2019-10-03 07:39:45 +10:00
parent c07eaa3384
commit 93e8c962fc
19 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/mikktspace/mikktspace.c
View 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);

4
source/blender/blenkernel/intern/movieclip.c
View 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;

1
source/blender/blenlib/intern/BLI_timer.c
View File

@ -42,7 +42,6 @@ typedef struct TimedFunction {
typedef struct TimerContainer {
ListBase funcs;
bool file_load_cb_registered;
} TimerContainer;
static TimerContainer GlobalTimer = {{0}};

1
source/blender/draw/engines/basic/basic_engine.c
View 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 */

1
source/blender/draw/engines/eevee/eevee_lightprobes.c
View 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;

1
source/blender/draw/engines/eevee/eevee_occlusion.c
View 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 */

1
source/blender/draw/engines/eevee/eevee_screen_raytrace.c
View 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[];

1
source/blender/draw/engines/eevee/eevee_volumes.c
View 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;

1
source/blender/draw/engines/workbench/workbench_deferred.c
View 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 */

2
source/blender/draw/engines/workbench/workbench_volume.c
View 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}};

1
source/blender/draw/intern/draw_armature.c
View 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;

5
source/blender/draw/intern/draw_cache.c
View 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;

1
source/blender/draw/intern/draw_common.c
View 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;

5
source/blender/draw/intern/draw_manager_data.c
View 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;

1
source/blender/editors/interface/interface_icons.c
View 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)

1
source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c
View 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];

5
source/blender/editors/sculpt_paint/paint_vertex.c
View 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;

1
source/blender/gpu/intern/gpu_batch_utils.c
View 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;

5
source/blender/imbuf/intern/imageprocess.c
View 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))