Eevee: Put all constant uniforms in a global UBO.

This is an optimization / cleanup commit.

The use of a global ubo remove lots of uniform lookups and only transfert data when needed.

Lots of renaming for more consistent codestyle.

1 files changed, 105 insertions, 99 deletions

diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index d1a45657a29..a960682e8c9 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -51,6 +51,7 @@ static struct {
 
 	struct GPUShader *volumetric_clear_sh;
 	struct GPUShader *volumetric_scatter_sh;
+	struct GPUShader *volumetric_scatter_with_lamps_sh;
 	struct GPUShader *volumetric_integration_sh;
 	struct GPUShader *volumetric_resolve_sh;
 
@@ -63,6 +64,7 @@ static struct {
 
 extern char datatoc_bsdf_common_lib_glsl[];
 extern char datatoc_bsdf_direct_lib_glsl[];
+extern char datatoc_common_uniforms_lib_glsl[];
 extern char datatoc_octahedron_lib_glsl[];
 extern char datatoc_irradiance_lib_glsl[];
 extern char datatoc_lamps_lib_glsl[];
@@ -78,10 +80,12 @@ extern char datatoc_gpu_shader_fullscreen_vert_glsl[];
 static void eevee_create_shader_volumes(void)
 {
 	e_data.volumetric_common_lib = BLI_string_joinN(
+	        datatoc_common_uniforms_lib_glsl,
 	        datatoc_bsdf_common_lib_glsl,
 	        datatoc_volumetric_lib_glsl);
 
 	e_data.volumetric_common_lamps_lib = BLI_string_joinN(
+	        datatoc_common_uniforms_lib_glsl,
 	        datatoc_bsdf_common_lib_glsl,
 	        datatoc_bsdf_direct_lib_glsl,
 	        datatoc_octahedron_lib_glsl,
@@ -104,6 +108,15 @@ static void eevee_create_shader_volumes(void)
 	        SHADER_DEFINES
 	        "#define VOLUMETRICS\n"
 	        "#define VOLUME_SHADOW\n");
+	e_data.volumetric_scatter_with_lamps_sh = DRW_shader_create_with_lib(
+	        datatoc_volumetric_vert_glsl,
+	        datatoc_volumetric_geom_glsl,
+	        datatoc_volumetric_scatter_frag_glsl,
+	        e_data.volumetric_common_lamps_lib,
+	        SHADER_DEFINES
+	        "#define VOLUMETRICS\n"
+	        "#define VOLUME_LIGHTING\n"
+	        "#define VOLUME_SHADOW\n");
 	e_data.volumetric_integration_sh = DRW_shader_create_with_lib(
 	        datatoc_volumetric_vert_glsl,
 	        datatoc_volumetric_geom_glsl,
@@ -121,6 +134,7 @@ int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 	EEVEE_FramebufferList *fbl = vedata->fbl;
 	EEVEE_TextureList *txl = vedata->txl;
 	EEVEE_EffectsInfo *effects = stl->effects;
+	EEVEE_CommonUniformBuffer *common_data = &sldata->common_data;
 
 	const DRWContextState *draw_ctx = DRW_context_state_get();
 	ViewLayer *view_layer = draw_ctx->view_layer;
@@ -137,29 +151,23 @@ int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 			eevee_create_shader_volumes();
 		}
 
-		if (sldata->volumetrics == NULL) {
-			sldata->volumetrics = MEM_callocN(sizeof(EEVEE_VolumetricsInfo), "EEVEE_VolumetricsInfo");
-		}
-
-		EEVEE_VolumetricsInfo *volumetrics = sldata->volumetrics;
-
 		int tile_size = BKE_collection_engine_property_value_get_int(props, "volumetric_tile_size");
 
 		/* Find Froxel Texture resolution. */
-		int froxel_tex_size[3];
+		int tex_size[3];
 
-		froxel_tex_size[0] = (int)ceilf(fmaxf(1.0f, viewport_size[0] / (float)tile_size));
-		froxel_tex_size[1] = (int)ceilf(fmaxf(1.0f, viewport_size[1] / (float)tile_size));
-		froxel_tex_size[2] = max_ii(BKE_collection_engine_property_value_get_int(props, "volumetric_samples"), 1);
+		tex_size[0] = (int)ceilf(fmaxf(1.0f, viewport_size[0] / (float)tile_size));
+		tex_size[1] = (int)ceilf(fmaxf(1.0f, viewport_size[1] / (float)tile_size));
+		tex_size[2] = max_ii(BKE_collection_engine_property_value_get_int(props, "volumetric_samples"), 1);
 
-		volumetrics->volume_coord_scale[0] = viewport_size[0] / (float)(tile_size * froxel_tex_size[0]);
-		volumetrics->volume_coord_scale[1] = viewport_size[1] / (float)(tile_size * froxel_tex_size[1]);
+		common_data->vol_coord_scale[0] = viewport_size[0] / (float)(tile_size * tex_size[0]);
+		common_data->vol_coord_scale[1] = viewport_size[1] / (float)(tile_size * tex_size[1]);
 
 		/* TODO compute snap to maxZBuffer for clustered rendering */
 
-		if ((volumetrics->froxel_tex_size[0] != froxel_tex_size[0]) ||
-		    (volumetrics->froxel_tex_size[1] != froxel_tex_size[1]) ||
-		    (volumetrics->froxel_tex_size[2] != froxel_tex_size[2]))
+		if ((common_data->vol_tex_size[0] != tex_size[0]) ||
+		    (common_data->vol_tex_size[1] != tex_size[1]) ||
+		    (common_data->vol_tex_size[2] != tex_size[2]))
 		{
 			DRW_TEXTURE_FREE_SAFE(txl->volume_prop_scattering);
 			DRW_TEXTURE_FREE_SAFE(txl->volume_prop_extinction);
@@ -172,38 +180,46 @@ int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 			DRW_FRAMEBUFFER_FREE_SAFE(fbl->volumetric_fb);
 			DRW_FRAMEBUFFER_FREE_SAFE(fbl->volumetric_scat_fb);
 			DRW_FRAMEBUFFER_FREE_SAFE(fbl->volumetric_integ_fb);
-			volumetrics->froxel_tex_size[0] = froxel_tex_size[0];
-			volumetrics->froxel_tex_size[1] = froxel_tex_size[1];
-			volumetrics->froxel_tex_size[2] = froxel_tex_size[2];
+			common_data->vol_tex_size[0] = tex_size[0];
+			common_data->vol_tex_size[1] = tex_size[1];
+			common_data->vol_tex_size[2] = tex_size[2];
 
-			volumetrics->inv_tex_size[0] = 1.0f / (float)(volumetrics->froxel_tex_size[0]);
-			volumetrics->inv_tex_size[1] = 1.0f / (float)(volumetrics->froxel_tex_size[1]);
-			volumetrics->inv_tex_size[2] = 1.0f / (float)(volumetrics->froxel_tex_size[2]);
+			common_data->vol_inv_tex_size[0] = 1.0f / (float)(tex_size[0]);
+			common_data->vol_inv_tex_size[1] = 1.0f / (float)(tex_size[1]);
+			common_data->vol_inv_tex_size[2] = 1.0f / (float)(tex_size[2]);
 		}
 
 		/* Like frostbite's paper, 5% blend of the new frame. */
-		volumetrics->history_alpha = (txl->volume_prop_scattering == NULL) ? 0.0f : 0.95f;
+		common_data->vol_history_alpha = (txl->volume_prop_scattering == NULL) ? 0.0f : 0.95f;
 
 		if (txl->volume_prop_scattering == NULL) {
 			/* Volume properties: We evaluate all volumetric objects
 			 * and store their final properties into each froxel */
-			txl->volume_prop_scattering = DRW_texture_create_3D(froxel_tex_size[0], froxel_tex_size[1], froxel_tex_size[2], DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
-			txl->volume_prop_extinction = DRW_texture_create_3D(froxel_tex_size[0], froxel_tex_size[1], froxel_tex_size[2], DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
-			txl->volume_prop_emission = DRW_texture_create_3D(froxel_tex_size[0], froxel_tex_size[1], froxel_tex_size[2], DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
-			txl->volume_prop_phase = DRW_texture_create_3D(froxel_tex_size[0], froxel_tex_size[1], froxel_tex_size[2], DRW_TEX_RG_16, DRW_TEX_FILTER, NULL);
+			txl->volume_prop_scattering = DRW_texture_create_3D(tex_size[0], tex_size[1], tex_size[2],
+			                                                    DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
+			txl->volume_prop_extinction = DRW_texture_create_3D(tex_size[0], tex_size[1], tex_size[2],
+			                                                    DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
+			txl->volume_prop_emission = DRW_texture_create_3D(tex_size[0], tex_size[1], tex_size[2],
+			                                                  DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
+			txl->volume_prop_phase = DRW_texture_create_3D(tex_size[0], tex_size[1], tex_size[2],
+			                                               DRW_TEX_RG_16, DRW_TEX_FILTER, NULL);
 
 			/* Volume scattering: We compute for each froxel the
 			 * Scattered light towards the view. We also resolve temporal
 			 * super sampling during this stage. */
-			txl->volume_scatter = DRW_texture_create_3D(froxel_tex_size[0], froxel_tex_size[1], froxel_tex_size[2], DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
-			txl->volume_transmittance = DRW_texture_create_3D(froxel_tex_size[0], froxel_tex_size[1], froxel_tex_size[2], DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
+			txl->volume_scatter = DRW_texture_create_3D(tex_size[0], tex_size[1], tex_size[2],
+			                                            DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
+			txl->volume_transmittance = DRW_texture_create_3D(tex_size[0], tex_size[1], tex_size[2],
+			                                                  DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
 
 			/* Final integration: We compute for each froxel the
 			 * amount of scattered light and extinction coef at this
 			 * given depth. We use theses textures as double buffer
 			 * for the volumetric history. */
-			txl->volume_scatter_history = DRW_texture_create_3D(froxel_tex_size[0], froxel_tex_size[1], froxel_tex_size[2], DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
-			txl->volume_transmittance_history = DRW_texture_create_3D(froxel_tex_size[0], froxel_tex_size[1], froxel_tex_size[2], DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
+			txl->volume_scatter_history = DRW_texture_create_3D(tex_size[0], tex_size[1], tex_size[2],
+			                                                    DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
+			txl->volume_transmittance_history = DRW_texture_create_3D(tex_size[0], tex_size[1], tex_size[2],
+			                                                          DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER, NULL);
 		}
 
 		/* Temporal Super sampling jitter */
@@ -221,7 +237,7 @@ int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 		}
 
 		if (do_taa) {
-			volumetrics->history_alpha = 0.0f;
+			common_data->vol_history_alpha = 0.0f;
 			current_sample = effects->taa_current_sample - 1;
 			effects->volume_current_sample = -1;
 		}
@@ -234,9 +250,9 @@ int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 		}
 		BLI_halton_3D(ht_primes, ht_offset, current_sample, ht_point);
 
-		volumetrics->jitter[0] = (float)ht_point[0];
-		volumetrics->jitter[1] = (float)ht_point[1];
-		volumetrics->jitter[2] = (float)ht_point[2];
+		common_data->vol_jitter[0] = (float)ht_point[0];
+		common_data->vol_jitter[1] = (float)ht_point[1];
+		common_data->vol_jitter[2] = (float)ht_point[2];
 
 		/* Framebuffer setup */
 		DRWFboTexture tex_vol[4] = {{&txl->volume_prop_scattering, DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER},
@@ -245,63 +261,64 @@ int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 		                            {&txl->volume_prop_phase, DRW_TEX_RG_16, DRW_TEX_FILTER}};
 
 		DRW_framebuffer_init(&fbl->volumetric_fb, &draw_engine_eevee_type,
-		                     (int)froxel_tex_size[0], (int)froxel_tex_size[1],
+		                     (int)tex_size[0], (int)tex_size[1],
 		                     tex_vol, 4);
 
 		DRWFboTexture tex_vol_scat[2] = {{&txl->volume_scatter, DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER},
 		                                 {&txl->volume_transmittance, DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER}};
 
 		DRW_framebuffer_init(&fbl->volumetric_scat_fb, &draw_engine_eevee_type,
-		                     (int)froxel_tex_size[0], (int)froxel_tex_size[1],
+		                     (int)tex_size[0], (int)tex_size[1],
 		                     tex_vol_scat, 2);
 
 		DRWFboTexture tex_vol_integ[2] = {{&txl->volume_scatter_history, DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER},
 		                                  {&txl->volume_transmittance_history, DRW_TEX_RGB_11_11_10, DRW_TEX_FILTER}};
 
 		DRW_framebuffer_init(&fbl->volumetric_integ_fb, &draw_engine_eevee_type,
-		                     (int)froxel_tex_size[0], (int)froxel_tex_size[1],
+		                     (int)tex_size[0], (int)tex_size[1],
 		                     tex_vol_integ, 2);
 
-		volumetrics->integration_start = BKE_collection_engine_property_value_get_float(props, "volumetric_start");
-		volumetrics->integration_end = BKE_collection_engine_property_value_get_float(props, "volumetric_end");
-		volumetrics->sample_distribution = 4.0f * (1.00001f - BKE_collection_engine_property_value_get_float(props, "volumetric_sample_distribution"));
-		volumetrics->use_volume_shadows = BKE_collection_engine_property_value_get_bool(props, "volumetric_shadows");
-		volumetrics->light_clamp = BKE_collection_engine_property_value_get_float(props, "volumetric_light_clamp");
+		float integration_start = BKE_collection_engine_property_value_get_float(props, "volumetric_start");
+		float integration_end = BKE_collection_engine_property_value_get_float(props, "volumetric_end");
+		common_data->vol_light_clamp = BKE_collection_engine_property_value_get_float(props, "volumetric_light_clamp");
 
-		if (volumetrics->use_volume_shadows) {
-			volumetrics->shadow_step_count = (float)BKE_collection_engine_property_value_get_int(props, "volumetric_shadow_samples");
+		common_data->vol_shadow_steps = (float)BKE_collection_engine_property_value_get_int(props, "volumetric_shadow_samples");
+		if (BKE_collection_engine_property_value_get_bool(props, "volumetric_shadows")) {
 		}
 		else {
-			volumetrics->shadow_step_count = 0;
+			common_data->vol_shadow_steps = 0;
 		}
 
 		if (DRW_viewport_is_persp_get()) {
-			const float clip_start = stl->g_data->viewvecs[0][2];
+			float sample_distribution = BKE_collection_engine_property_value_get_float(props, "volumetric_sample_distribution");
+			sample_distribution = 4.0f * (1.00001f - sample_distribution);
+
+			const float clip_start = common_data->view_vecs[0][2];
 			/* Negate */
-			float near = volumetrics->integration_start = min_ff(-volumetrics->integration_start, clip_start - 1e-4f);
-			float far = volumetrics->integration_end = min_ff(-volumetrics->integration_end, near - 1e-4f);
+			float near = integration_start = min_ff(-integration_start, clip_start - 1e-4f);
+			float far = integration_end = min_ff(-integration_end, near - 1e-4f);
 
-			volumetrics->depth_param[0] = (far - near * exp2(1.0f / volumetrics->sample_distribution)) / (far - near);
-			volumetrics->depth_param[1] = (1.0f - volumetrics->depth_param[0]) / near;
-			volumetrics->depth_param[2] = volumetrics->sample_distribution;
+			common_data->vol_depth_param[0] = (far - near * exp2(1.0f / sample_distribution)) / (far - near);
+			common_data->vol_depth_param[1] = (1.0f - common_data->vol_depth_param[0]) / near;
+			common_data->vol_depth_param[2] = sample_distribution;
 		}
 		else {
-			const float clip_start = stl->g_data->viewvecs[0][2];
-			const float clip_end = stl->g_data->viewvecs[1][2];
-			volumetrics->integration_start = min_ff(volumetrics->integration_end, clip_start);
-			volumetrics->integration_end = max_ff(-volumetrics->integration_end, clip_end);
-
-			volumetrics->depth_param[0] = volumetrics->integration_start;
-			volumetrics->depth_param[1] = volumetrics->integration_end;
-			volumetrics->depth_param[2] = 1.0f / (volumetrics->integration_end - volumetrics->integration_start);
+			const float clip_start = common_data->view_vecs[0][2];
+			const float clip_end = common_data->view_vecs[1][2];
+			integration_start = min_ff(integration_end, clip_start);
+			integration_end = max_ff(-integration_end, clip_end);
+
+			common_data->vol_depth_param[0] = integration_start;
+			common_data->vol_depth_param[1] = integration_end;
+			common_data->vol_depth_param[2] = 1.0f / (integration_end - integration_start);
 		}
 
 		/* Disable clamp if equal to 0. */
-		if (volumetrics->light_clamp == 0.0) {
-			volumetrics->light_clamp = FLT_MAX;
+		if (common_data->vol_light_clamp == 0.0) {
+			common_data->vol_light_clamp = FLT_MAX;
 		}
 
-		volumetrics->use_lights = BKE_collection_engine_property_value_get_bool(props, "volumetric_lights");
+		common_data->vol_use_lights = BKE_collection_engine_property_value_get_bool(props, "volumetric_lights");
 
 		return EFFECT_VOLUMETRIC | EFFECT_POST_BUFFER;
 	}
@@ -328,12 +345,11 @@ void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 	EEVEE_StorageList *stl = vedata->stl;
 	EEVEE_TextureList *txl = vedata->txl;
 	EEVEE_EffectsInfo *effects = stl->effects;
+	EEVEE_CommonUniformBuffer *common_data = &sldata->common_data;
 
 	if ((effects->enabled_effects & EFFECT_VOLUMETRIC) != 0) {
 		const DRWContextState *draw_ctx = DRW_context_state_get();
 		Scene *scene = draw_ctx->scene;
-		EEVEE_VolumetricsInfo *volumetrics = sldata->volumetrics;
-		static int zero = 0;
 		DRWShadingGroup *grp;
 
 		/* Quick breakdown of the Volumetric rendering:
@@ -370,65 +386,59 @@ void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 		if (wo != NULL && wo->use_nodes && wo->nodetree) {
 			struct GPUMaterial *mat = EEVEE_material_world_volume_get(scene, wo);
 
-			grp = DRW_shgroup_material_empty_tri_batch_create(mat, psl->volumetric_world_ps, volumetrics->froxel_tex_size[2]);
+			grp = DRW_shgroup_material_empty_tri_batch_create(mat,
+			                                                  psl->volumetric_world_ps,
+			                                                  common_data->vol_tex_size[2]);
 
 			if (grp) {
-				DRW_shgroup_uniform_vec4(grp, "viewvecs[0]", (float *)stl->g_data->viewvecs, 2);
-				DRW_shgroup_uniform_ivec3(grp, "volumeTextureSize", (int *)volumetrics->froxel_tex_size, 1);
-				DRW_shgroup_uniform_vec2(grp, "volume_uv_ratio", (float *)volumetrics->volume_coord_scale, 1);
-				DRW_shgroup_uniform_vec3(grp, "volume_param", (float *)volumetrics->depth_param, 1);
-				DRW_shgroup_uniform_vec3(grp, "volume_jitter", (float *)volumetrics->jitter, 1);
+				DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 			}
 		}
 		else {
 			/* If no world or volume material is present just clear the buffer with this drawcall */
-			grp = DRW_shgroup_empty_tri_batch_create(e_data.volumetric_clear_sh, psl->volumetric_world_ps, volumetrics->froxel_tex_size[2]);
+			grp = DRW_shgroup_empty_tri_batch_create(e_data.volumetric_clear_sh,
+				                                     psl->volumetric_world_ps,
+				                                     common_data->vol_tex_size[2]);
 
-			DRW_shgroup_uniform_ivec3(grp, "volumeTextureSize", (int *)volumetrics->froxel_tex_size, 1);
+			DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 		}
 
 		/* Volumetric Objects */
-		psl->volumetric_objects_ps = DRW_pass_create("Volumetric Properties", DRW_STATE_WRITE_COLOR | DRW_STATE_ADDITIVE);
+		psl->volumetric_objects_ps = DRW_pass_create("Volumetric Properties", DRW_STATE_WRITE_COLOR |
+		                                                                      DRW_STATE_ADDITIVE);
 
+		struct GPUShader *scatter_sh = (common_data->vol_use_lights) ? e_data.volumetric_scatter_with_lamps_sh
+		                                                      : e_data.volumetric_scatter_sh;
 		psl->volumetric_scatter_ps = DRW_pass_create("Volumetric Scattering", DRW_STATE_WRITE_COLOR);
-		grp = DRW_shgroup_empty_tri_batch_create(e_data.volumetric_scatter_sh, psl->volumetric_scatter_ps, volumetrics->froxel_tex_size[2]);
-		DRW_shgroup_uniform_vec4(grp, "viewvecs[0]", (float *)stl->g_data->viewvecs, 2);
-		DRW_shgroup_uniform_vec2(grp, "volume_uv_ratio", (float *)volumetrics->volume_coord_scale, 1);
-		DRW_shgroup_uniform_vec3(grp, "volume_param", (float *)volumetrics->depth_param, 1);
-		DRW_shgroup_uniform_vec3(grp, "volume_jitter", (float *)volumetrics->jitter, 1);
-		DRW_shgroup_uniform_mat4(grp, "PastViewProjectionMatrix", (float *)stl->g_data->prev_persmat);
-		DRW_shgroup_uniform_block(grp, "light_block", sldata->light_ubo);
-		DRW_shgroup_uniform_block(grp, "shadow_block", sldata->shadow_ubo);
-		DRW_shgroup_uniform_int(grp, "light_count", (volumetrics->use_lights) ? &sldata->lamps->num_light : &zero, 1);
+		grp = DRW_shgroup_empty_tri_batch_create(scatter_sh, psl->volumetric_scatter_ps,
+		                                         common_data->vol_tex_size[2]);
 		DRW_shgroup_uniform_buffer(grp, "irradianceGrid", &sldata->irradiance_pool);
 		DRW_shgroup_uniform_buffer(grp, "shadowTexture", &sldata->shadow_pool);
-		DRW_shgroup_uniform_float(grp, "volume_light_clamp", &volumetrics->light_clamp, 1);
-		DRW_shgroup_uniform_float(grp, "volume_shadows_steps", &volumetrics->shadow_step_count, 1);
-		DRW_shgroup_uniform_float(grp, "volume_history_alpha", &volumetrics->history_alpha, 1);
 		DRW_shgroup_uniform_buffer(grp, "volumeScattering", &txl->volume_prop_scattering);
 		DRW_shgroup_uniform_buffer(grp, "volumeExtinction", &txl->volume_prop_extinction);
 		DRW_shgroup_uniform_buffer(grp, "volumeEmission", &txl->volume_prop_emission);
 		DRW_shgroup_uniform_buffer(grp, "volumePhase", &txl->volume_prop_phase);
 		DRW_shgroup_uniform_buffer(grp, "historyScattering", &txl->volume_scatter_history);
 		DRW_shgroup_uniform_buffer(grp, "historyTransmittance", &txl->volume_transmittance_history);
+		DRW_shgroup_uniform_block(grp, "light_block", sldata->light_ubo);
+		DRW_shgroup_uniform_block(grp, "shadow_block", sldata->shadow_ubo);
+		DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 
 		psl->volumetric_integration_ps = DRW_pass_create("Volumetric Integration", DRW_STATE_WRITE_COLOR);
-		grp = DRW_shgroup_empty_tri_batch_create(e_data.volumetric_integration_sh, psl->volumetric_integration_ps, volumetrics->froxel_tex_size[2]);
-		DRW_shgroup_uniform_vec4(grp, "viewvecs[0]", (float *)stl->g_data->viewvecs, 2);
-		DRW_shgroup_uniform_vec2(grp, "volume_uv_ratio", (float *)volumetrics->volume_coord_scale, 1);
-		DRW_shgroup_uniform_vec3(grp, "volume_param", (float *)volumetrics->depth_param, 1);
+		grp = DRW_shgroup_empty_tri_batch_create(e_data.volumetric_integration_sh,
+		                                         psl->volumetric_integration_ps,
+		                                         common_data->vol_tex_size[2]);
 		DRW_shgroup_uniform_buffer(grp, "volumeScattering", &txl->volume_scatter);
 		DRW_shgroup_uniform_buffer(grp, "volumeExtinction", &txl->volume_transmittance);
+		DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 
 		psl->volumetric_resolve_ps = DRW_pass_create("Volumetric Resolve", DRW_STATE_WRITE_COLOR);
 		grp = DRW_shgroup_create(e_data.volumetric_resolve_sh, psl->volumetric_resolve_ps);
-		DRW_shgroup_uniform_vec4(grp, "viewvecs[0]", (float *)stl->g_data->viewvecs, 2);
-		DRW_shgroup_uniform_vec2(grp, "volume_uv_ratio", (float *)volumetrics->volume_coord_scale, 1);
-		DRW_shgroup_uniform_vec3(grp, "volume_param", (float *)volumetrics->depth_param, 1);
 		DRW_shgroup_uniform_buffer(grp, "inScattering", &txl->volume_scatter);
 		DRW_shgroup_uniform_buffer(grp, "inTransmittance", &txl->volume_transmittance);
 		DRW_shgroup_uniform_buffer(grp, "inSceneColor", &e_data.color_src);
 		DRW_shgroup_uniform_buffer(grp, "inSceneDepth", &e_data.depth_src);
+		DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 		DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
 	}
 }
@@ -438,7 +448,6 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved
 	float *texcoloc = NULL;
 	float *texcosize = NULL;
 	struct ModifierData *md = NULL;
-	EEVEE_VolumetricsInfo *volumetrics = sldata->volumetrics;
 	Material *ma = give_current_material(ob, 1);
 
 	if (ma == NULL) {
@@ -447,7 +456,7 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved
 
 	struct GPUMaterial *mat = EEVEE_material_mesh_volume_get(scene, ma);
 
-	DRWShadingGroup *grp = DRW_shgroup_material_empty_tri_batch_create(mat, vedata->psl->volumetric_objects_ps, volumetrics->froxel_tex_size[2]);
+	DRWShadingGroup *grp = DRW_shgroup_material_empty_tri_batch_create(mat, vedata->psl->volumetric_objects_ps, sldata->common_data.vol_tex_size[2]);
 
 	/* Making sure it's updated. */
 	invert_m4_m4(ob->imat, ob->obmat);
@@ -455,14 +464,10 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved
 	BKE_mesh_texspace_get_reference((struct Mesh *)ob->data, NULL, &texcoloc, NULL, &texcosize);
 
 	if (grp) {
+		DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
 		DRW_shgroup_uniform_mat4(grp, "volumeObjectMatrix", (float *)ob->imat);
 		DRW_shgroup_uniform_vec3(grp, "volumeOrcoLoc", texcoloc, 1);
 		DRW_shgroup_uniform_vec3(grp, "volumeOrcoSize", texcosize, 1);
-		DRW_shgroup_uniform_vec4(grp, "viewvecs[0]", (float *)vedata->stl->g_data->viewvecs, 2);
-		DRW_shgroup_uniform_ivec3(grp, "volumeTextureSize", (int *)volumetrics->froxel_tex_size, 1);
-		DRW_shgroup_uniform_vec2(grp, "volume_uv_ratio", (float *)volumetrics->volume_coord_scale, 1);
-		DRW_shgroup_uniform_vec3(grp, "volume_param", (float *)volumetrics->depth_param, 1);
-		DRW_shgroup_uniform_vec3(grp, "volume_jitter", (float *)volumetrics->jitter, 1);
 	}
 
 	/* Smoke Simulation */
@@ -572,6 +577,7 @@ void EEVEE_volumes_free(void)
 
 	DRW_SHADER_FREE_SAFE(e_data.volumetric_clear_sh);
 	DRW_SHADER_FREE_SAFE(e_data.volumetric_scatter_sh);
+	DRW_SHADER_FREE_SAFE(e_data.volumetric_scatter_with_lamps_sh);
 	DRW_SHADER_FREE_SAFE(e_data.volumetric_integration_sh);
 	DRW_SHADER_FREE_SAFE(e_data.volumetric_resolve_sh);
 }