Cleanup: unused structs, struct members

11 files changed, 0 insertions, 20 deletions

diff --git a/source/blender/draw/engines/basic/basic_engine.c b/source/blender/draw/engines/basic/basic_engine.c
index 188e252a285..0dd1a4fd686 100644
--- a/source/blender/draw/engines/basic/basic_engine.c
+++ b/source/blender/draw/engines/basic/basic_engine.c
@@ -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 */
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 19f3983998e..4b0af273f7f 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -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;
diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.c b/source/blender/draw/engines/eevee/eevee_occlusion.c
index 924b3d3b19b..c60aa173b48 100644
--- a/source/blender/draw/engines/eevee/eevee_occlusion.c
+++ b/source/blender/draw/engines/eevee/eevee_occlusion.c
@@ -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 */
diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
index 2daf2388d63..591ca31017c 100644
--- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
+++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
@@ -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[];
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index fac87bad41a..aaa351a1922 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -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;
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index 15522ba0dfb..2e8b952f234 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -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 */
 
diff --git a/source/blender/draw/engines/workbench/workbench_volume.c b/source/blender/draw/engines/workbench/workbench_volume.c
index e017661b6cd..23f0898c138 100644
--- a/source/blender/draw/engines/workbench/workbench_volume.c
+++ b/source/blender/draw/engines/workbench/workbench_volume.c
@@ -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}};
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index 865cfea14e3..5cd6a4a1286 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -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;
diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c
index 019098e5b90..b085d402e81 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -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;
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 7f679dd5581..988859c64a5 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -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;
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c
index dcf526679bf..330f72eda18 100644
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@ -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;