Draw Engines: Make g_data struct part of the viewport storage

This makes viewport cache construction independant from each others and will allow multithread down the road.

1 files changed, 13 insertions, 0 deletions

diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index 4d8f697cc64..b81731a9188 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -50,6 +50,7 @@ typedef struct EEVEE_StorageList {
 	struct EEVEE_Light *lights_data;            /* Array, Packed lights data info, duplication of what is in the Uniform Buffer in Vram */
 	struct Object **lights_ref;                 /* List of all lights in the buffer. */
 	struct GPUUniformBuffer *lights_ubo;
+	struct g_data *g_data;
 } EEVEE_StorageList;
 
 typedef struct EEVEE_LightsInfo {
@@ -64,6 +65,18 @@ typedef struct EEVEE_Data {
 	EEVEE_StorageList *stl;
 } EEVEE_Data;
 
+typedef struct g_data{
+	struct DRWShadingGroup *default_lit_grp;
+	struct DRWShadingGroup *depth_shgrp;
+	struct DRWShadingGroup *depth_shgrp_select;
+	struct DRWShadingGroup *depth_shgrp_active;
+	struct DRWShadingGroup *depth_shgrp_cull;
+	struct DRWShadingGroup *depth_shgrp_cull_select;
+	struct DRWShadingGroup *depth_shgrp_cull_active;
+
+	struct ListBase lamps; /* Lamps gathered during cache iteration */
+} g_data; /* Transient data */
+
 /* eevee_lights.c */
 void EEVEE_lights_init(EEVEE_StorageList *stl);
 void EEVEE_lights_cache_init(EEVEE_StorageList *stl);