1 files changed, 17 insertions, 41 deletions

diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index b2e5a0abe94..872696a8b7c 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -158,7 +158,7 @@ void EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
 
   if (DRW_view_is_persp_get(NULL)) {
     float sample_distribution = scene_eval->eevee.volumetric_sample_distribution;
-    sample_distribution = 4.0f * (max_ff(1.0f - sample_distribution, 1e-2f));
+    sample_distribution = 4.0f * max_ff(1.0f - sample_distribution, 1e-2f);
 
     const float clip_start = DRW_view_near_distance_get(NULL);
     /* Negate */
@@ -299,7 +299,7 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata,
   }
 
   float size[3];
-  mat4_to_size(size, ob->obmat);
+  mat4_to_size(size, ob->object_to_world);
   /* Check if any of the axes have 0 length. (see T69070) */
   const float epsilon = 1e-8f;
   if ((size[0] < epsilon) || (size[1] < epsilon) || (size[2] < epsilon)) {
@@ -396,37 +396,18 @@ void EEVEE_volumes_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
         grp, NULL, USE_VOLUME_OPTI ? 1 : common_data->vol_tex_size[2]);
 
     DRW_PASS_CREATE(psl->volumetric_resolve_ps, DRW_STATE_WRITE_COLOR | DRW_STATE_BLEND_CUSTOM);
-    if (GPU_compute_shader_support() && GPU_shader_image_load_store_support()) {
-      const bool use_float_target = DRW_state_is_image_render();
-      grp = DRW_shgroup_create(EEVEE_shaders_volumes_resolve_comp_sh_get(use_float_target),
-                               psl->volumetric_resolve_ps);
-      DRW_shgroup_uniform_texture_ref(grp, "inScattering", &txl->volume_scatter);
-      DRW_shgroup_uniform_texture_ref(grp, "inTransmittance", &txl->volume_transmit);
-      DRW_shgroup_uniform_texture_ref(grp, "inSceneDepth", &e_data.depth_src);
-      DRW_shgroup_uniform_block(grp, "light_block", sldata->light_ubo);
-      DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
-      DRW_shgroup_uniform_block(grp, "probe_block", sldata->probe_ubo);
-      DRW_shgroup_uniform_block(grp, "renderpass_block", sldata->renderpass_ubo.combined);
-      DRW_shgroup_uniform_block(grp, "shadow_block", sldata->shadow_ubo);
-      DRW_shgroup_uniform_image_ref(grp, "target_img", &txl->color);
-
-      const float *size = DRW_viewport_size_get();
-      DRW_shgroup_call_compute(grp, size[0], size[1], 1);
-    }
-    else {
-      grp = DRW_shgroup_create(EEVEE_shaders_volumes_resolve_sh_get(false),
-                               psl->volumetric_resolve_ps);
-      DRW_shgroup_uniform_texture_ref(grp, "inScattering", &txl->volume_scatter);
-      DRW_shgroup_uniform_texture_ref(grp, "inTransmittance", &txl->volume_transmit);
-      DRW_shgroup_uniform_texture_ref(grp, "inSceneDepth", &e_data.depth_src);
-      DRW_shgroup_uniform_block(grp, "light_block", sldata->light_ubo);
-      DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
-      DRW_shgroup_uniform_block(grp, "probe_block", sldata->probe_ubo);
-      DRW_shgroup_uniform_block(grp, "renderpass_block", sldata->renderpass_ubo.combined);
-      DRW_shgroup_uniform_block(grp, "shadow_block", sldata->shadow_ubo);
+    grp = DRW_shgroup_create(EEVEE_shaders_volumes_resolve_sh_get(false),
+                             psl->volumetric_resolve_ps);
+    DRW_shgroup_uniform_texture_ref(grp, "inScattering", &txl->volume_scatter);
+    DRW_shgroup_uniform_texture_ref(grp, "inTransmittance", &txl->volume_transmit);
+    DRW_shgroup_uniform_texture_ref(grp, "inSceneDepth", &e_data.depth_src);
+    DRW_shgroup_uniform_block(grp, "light_block", sldata->light_ubo);
+    DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
+    DRW_shgroup_uniform_block(grp, "probe_block", sldata->probe_ubo);
+    DRW_shgroup_uniform_block(grp, "renderpass_block", sldata->renderpass_ubo.combined);
+    DRW_shgroup_uniform_block(grp, "shadow_block", sldata->shadow_ubo);
 
-      DRW_shgroup_call_procedural_triangles(grp, NULL, 1);
-    }
+    DRW_shgroup_call_procedural_triangles(grp, NULL, 1);
   }
 }
 
@@ -565,16 +546,11 @@ void EEVEE_volumes_resolve(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *veda
     }
 
     /* Apply for opaque geometry. */
-    if (GPU_compute_shader_support() && GPU_shader_image_load_store_support()) {
-      DRW_draw_pass(psl->volumetric_resolve_ps);
-    }
-    else {
-      GPU_framebuffer_bind(fbl->main_color_fb);
-      DRW_draw_pass(psl->volumetric_resolve_ps);
+    GPU_framebuffer_bind(fbl->main_color_fb);
+    DRW_draw_pass(psl->volumetric_resolve_ps);
 
-      /* Restore. */
-      GPU_framebuffer_bind(fbl->main_fb);
-    }
+    /* Restore. */
+    GPU_framebuffer_bind(fbl->main_fb);
   }
 }