EEVEE: Fix dependencies to draw_view

14 files changed, 73 insertions, 76 deletions

diff --git a/source/blender/draw/engines/eevee/shaders/eevee_hiz_copy_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_hiz_copy_frag.glsl
index 3c62635263c..4abd6d9233b 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_hiz_copy_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_hiz_copy_frag.glsl
@@ -3,8 +3,6 @@
  * clamped texture extrapolation.
  */
 
-#pragma BLENDER_REQUIRE(common_view_lib.glsl)
-
 void main()
 {
   vec2 uv = gl_FragCoord.xy / vec2(textureSize(depth_tx, 0).xy);
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_debug_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_debug_comp.glsl
index e27c982cf7d..cda33978807 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_debug_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_debug_comp.glsl
@@ -7,8 +7,6 @@
  * This is nice to inspect the state of the page allocation during the pipeline.
  */
 
-#pragma BLENDER_REQUIRE(common_view_lib.glsl)
-#pragma BLENDER_REQUIRE(common_math_lib.glsl)
 #pragma BLENDER_REQUIRE(eevee_shadow_page_lib.glsl)
 #pragma BLENDER_REQUIRE(eevee_shadow_tilemap_lib.glsl)
 
diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_free_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_free_comp.glsl
index 3a7c06344bf..b3eaaf2c4a7 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_free_comp.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_page_free_comp.glsl
@@ -5,8 +5,6 @@
  * Scan all tilemaps and add all free pages inside the free page heap.
  */
 
-#pragma BLENDER_REQUIRE(common_view_lib.glsl)
-#pragma BLENDER_REQUIRE(common_math_lib.glsl)
 #pragma BLENDER_REQUIRE(eevee_shadow_page_lib.glsl)
 #pragma BLENDER_REQUIRE(eevee_shadow_tilemap_lib.glsl)
 
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_culling_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_culling_info.hh
index ec6a76dec66..53ef7962409 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_culling_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_culling_info.hh
@@ -11,7 +11,7 @@
 
 GPU_SHADER_CREATE_INFO(eevee_culling_select)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .local_group_size(CULLING_BATCH_SIZE)
     .storage_buf(0, Qualifier::READ, "LightData", "lights_buf[]")
     .storage_buf(1, Qualifier::READ_WRITE, "CullingData", "lights_cull_buf")
@@ -20,7 +20,7 @@ GPU_SHADER_CREATE_INFO(eevee_culling_select)
 
 GPU_SHADER_CREATE_INFO(eevee_culling_sort)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .local_group_size(CULLING_BATCH_SIZE)
     .storage_buf(0, Qualifier::READ, "LightData", "lights_buf[]")
     .storage_buf(1, Qualifier::READ_WRITE, "CullingData", "lights_cull_buf")
@@ -34,7 +34,7 @@ GPU_SHADER_CREATE_INFO(eevee_culling_sort)
 
 GPU_SHADER_CREATE_INFO(eevee_culling_tile)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .local_group_size(1024)
     .storage_buf(0, Qualifier::READ, "LightData", "lights_buf[]")
     .storage_buf(1, Qualifier::READ, "CullingData", "lights_cull_buf")
@@ -42,7 +42,6 @@ GPU_SHADER_CREATE_INFO(eevee_culling_tile)
     .compute_source("eevee_culling_tile_comp.glsl");
 
 GPU_SHADER_CREATE_INFO(eevee_light_data)
-    .additional_info("eevee_shared")
     .storage_buf(0, Qualifier::READ, "LightData", "lights_buf[]")
     .storage_buf(1, Qualifier::READ, "CullingZBin", "lights_zbin_buf[]")
     .storage_buf(2, Qualifier::READ, "CullingData", "lights_cull_buf")
@@ -58,7 +57,7 @@ GPU_SHADER_CREATE_INFO(eevee_culling_debug)
     .do_static_compilation(true)
     .sampler(0, ImageType::DEPTH_2D, "depth_tx")
     .fragment_out(0, Type::VEC4, "out_debug_color")
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .fragment_source("eevee_culling_debug_frag.glsl")
     .additional_info("draw_fullscreen", "eevee_light_data");
 
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_info.hh
index 9a249706cc4..7a438b14f44 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_deferred_info.hh
@@ -20,7 +20,7 @@ GPU_SHADER_CREATE_INFO(eevee_deferred_direct)
     .fragment_out(0, Type::VEC4, "out_combined")
     .fragment_out(1, Type::VEC4, "out_diffuse")
     .fragment_out(2, Type::VEC3, "out_specular")
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .fragment_source("eevee_deferred_direct_frag.glsl")
     .additional_info("draw_fullscreen",
                      "eevee_transmittance_data",
@@ -43,7 +43,7 @@ GPU_SHADER_CREATE_INFO(eevee_deferred_holdout)
     .fragment_out(5, Type::VEC3, "out_holdout")
     .additional_info("eevee_shared")
     .fragment_source("eevee_deferred_holdout_frag.glsl")
-    .additional_info("draw_fullscreen");
+    .additional_info("draw_fullscreen", "draw_view");
 
 /** \} */
 
@@ -63,7 +63,7 @@ GPU_SHADER_CREATE_INFO(eevee_deferred_transparent)
     .fragment_out(5, Type::VEC3, "out_holdout")
     .additional_info("eevee_shared")
     .fragment_source("eevee_deferred_transparent_frag.glsl")
-    .additional_info("draw_fullscreen", "eevee_light_data");
+    .additional_info("draw_fullscreen", "draw_view", "eevee_light_data");
 
 /** \} */
 
@@ -80,6 +80,7 @@ GPU_SHADER_CREATE_INFO(eevee_deferred_volume)
     .additional_info("eevee_shared")
     .fragment_source("eevee_deferred_volume_frag.glsl")
     .additional_info("draw_fullscreen",
+                     "draw_view",
                      "eevee_utility_texture",
                      "eevee_light_data",
                      "eevee_shadow_data");
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_info.hh
index cf638804b99..e2ab15eeac2 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_depth_of_field_info.hh
@@ -7,8 +7,8 @@
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_bokeh_lut)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
-    .uniform_buf(0, "DepthOfFieldData", "dof_buf")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(1, "DepthOfFieldData", "dof_buf")
     .fragment_out(0, Type::VEC2, "out_gather_lut")
     .fragment_out(1, Type::FLOAT, "out_scatter_lut")
     .fragment_out(2, Type::FLOAT, "out_resolve_lut")
@@ -17,8 +17,8 @@ GPU_SHADER_CREATE_INFO(eevee_depth_of_field_bokeh_lut)
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_setup)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
-    .uniform_buf(0, "DepthOfFieldData", "dof_buf")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(1, "DepthOfFieldData", "dof_buf")
     .sampler(0, ImageType::FLOAT_2D, "color_tx", Frequency::PASS)
     .sampler(1, ImageType::DEPTH_2D, "depth_tx", Frequency::PASS)
     .fragment_out(0, Type::VEC4, "out_color")
@@ -28,7 +28,7 @@ GPU_SHADER_CREATE_INFO(eevee_depth_of_field_setup)
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_filter)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .sampler(0, ImageType::FLOAT_2D, "color_tx", Frequency::PASS)
     .sampler(1, ImageType::FLOAT_2D, "weight_tx", Frequency::PASS)
     .fragment_out(0, Type::VEC4, "out_color")
@@ -38,8 +38,8 @@ GPU_SHADER_CREATE_INFO(eevee_depth_of_field_filter)
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_reduce_copy)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
-    .uniform_buf(0, "DepthOfFieldData", "dof_buf")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(1, "DepthOfFieldData", "dof_buf")
     .sampler(0, ImageType::FLOAT_2D, "color_tx", Frequency::PASS)
     .sampler(1, ImageType::FLOAT_2D, "coc_tx", Frequency::PASS)
     .sampler(2, ImageType::FLOAT_2D, "downsampled_tx", Frequency::PASS)
@@ -51,7 +51,7 @@ GPU_SHADER_CREATE_INFO(eevee_depth_of_field_reduce_copy)
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_reduce_downsample)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .sampler(0, ImageType::FLOAT_2D, "color_tx", Frequency::PASS)
     .sampler(1, ImageType::FLOAT_2D, "coc_tx", Frequency::PASS)
     .fragment_out(0, Type::VEC4, "out_color")
@@ -60,9 +60,9 @@ GPU_SHADER_CREATE_INFO(eevee_depth_of_field_reduce_downsample)
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_reduce_recursive)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
-    .uniform_buf(0, "DepthOfFieldData", "dof_buf")
-    .uniform_buf(1, "SamplingData", "sampling_buf")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(1, "DepthOfFieldData", "dof_buf")
+    .uniform_buf(2, "SamplingData", "sampling_buf")
     .sampler(0, ImageType::DEPTH_2D, "color_tx", Frequency::PASS)
     .sampler(1, ImageType::FLOAT_2D, "coc_tx", Frequency::PASS)
     .fragment_out(0, Type::VEC4, "out_color")
@@ -115,8 +115,8 @@ GPU_SHADER_CREATE_INFO(eevee_depth_of_field_lq).define("DOF_SLIGHT_FOCUS_DENSITY
  * \{ */
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_gather)
-    .additional_info("eevee_shared")
-    .uniform_buf(0, "DepthOfFieldData", "dof_buf")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(2, "DepthOfFieldData", "dof_buf")
     .uniform_buf(1, "SamplingData", "sampling_buf")
     .sampler(0, ImageType::FLOAT_2D, "color_tx", Frequency::PASS)
     .sampler(1, ImageType::FLOAT_2D, "color_bilinear_tx", Frequency::PASS)
@@ -138,8 +138,8 @@ EEVEE_DOF_GROUND_VARIATIONS(eevee_depth_of_field_gather, "eevee_depth_of_field_g
  * \{ */
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_gather_holefill)
-    .additional_info("eevee_shared")
-    .uniform_buf(0, "DepthOfFieldData", "dof_buf")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(2, "DepthOfFieldData", "dof_buf")
     .uniform_buf(1, "SamplingData", "sampling_buf")
     .sampler(0, ImageType::FLOAT_2D, "color_tx", Frequency::PASS)
     .sampler(1, ImageType::FLOAT_2D, "color_bilinear_tx", Frequency::PASS)
@@ -171,8 +171,8 @@ GPU_SHADER_INTERFACE_INFO(eevee_depth_of_field_scatter_iface, "")
     .flat(Type::FLOAT, "spritesize");
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_scatter)
-    .additional_info("eevee_shared")
-    .uniform_buf(0, "DepthOfFieldData", "dof_buf")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(2, "DepthOfFieldData", "dof_buf")
     .sampler(0, ImageType::FLOAT_2D, "color_tx")
     .sampler(1, ImageType::DEPTH_2D, "depth_tx")
     .sampler(2, ImageType::FLOAT_2D, "occlusion_tx")
@@ -192,8 +192,8 @@ EEVEE_DOF_GROUND_VARIATIONS(eevee_depth_of_field_scatter, "eevee_depth_of_field_
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_resolve)
     .define("DOF_RESOLVE_PASS", "true")
-    .additional_info("eevee_shared")
-    .uniform_buf(0, "DepthOfFieldData", "dof_buf")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(2, "DepthOfFieldData", "dof_buf")
     .uniform_buf(1, "SamplingData", "sampling_buf")
     .sampler(0, ImageType::DEPTH_2D, "depth_tx")
     .sampler(1, ImageType::FLOAT_2D, "color_tx")
@@ -218,7 +218,7 @@ EEVEE_DOF_HQ_VARIATIONS(eevee_depth_of_field_resolve, "eevee_depth_of_field_reso
  * \{ */
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_tiles_dilate)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .sampler(0, ImageType::FLOAT_2D, "tiles_fg_tx", Frequency::PASS)
     .sampler(1, ImageType::FLOAT_2D, "tiles_bg_tx", Frequency::PASS)
     .fragment_out(0, Type::VEC4, "out_tile_fg")
@@ -241,7 +241,7 @@ GPU_SHADER_CREATE_INFO(eevee_depth_of_field_tiles_dilate_minmax)
 
 GPU_SHADER_CREATE_INFO(eevee_depth_of_field_tiles_flatten)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .sampler(0, ImageType::FLOAT_2D, "coc_tx", Frequency::PASS)
     .fragment_out(0, Type::VEC4, "out_tile_fg")
     .fragment_out(1, Type::VEC3, "out_tile_bg")
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_film_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_film_info.hh
index ee284d3dcf8..06cf2b1231e 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_film_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_film_info.hh
@@ -7,7 +7,7 @@
 
 GPU_SHADER_CREATE_INFO(eevee_film_filter)
     .do_static_compilation(true)
-    .uniform_buf(0, "CameraData", "camera")
+    .uniform_buf(2, "CameraData", "camera")
     .uniform_buf(1, "FilmData", "film")
     .sampler(0, ImageType::FLOAT_2D, "input_tx")
     .sampler(1, ImageType::FLOAT_2D, "data_tx")
@@ -16,11 +16,11 @@ GPU_SHADER_CREATE_INFO(eevee_film_filter)
     .fragment_out(1, Type::FLOAT, "out_weight")
     .additional_info("eevee_shared")
     .fragment_source("eevee_film_filter_frag.glsl")
-    .additional_info("draw_fullscreen");
+    .additional_info("draw_fullscreen", "draw_view");
 
 GPU_SHADER_CREATE_INFO(eevee_film_filter_depth)
     .do_static_compilation(true)
-    .uniform_buf(0, "CameraData", "camera")
+    .uniform_buf(2, "CameraData", "camera")
     .uniform_buf(1, "FilmData", "film")
     .sampler(0, ImageType::DEPTH_2D, "input_tx")
     .sampler(1, ImageType::FLOAT_2D, "data_tx")
@@ -29,7 +29,7 @@ GPU_SHADER_CREATE_INFO(eevee_film_filter_depth)
     .fragment_out(1, Type::FLOAT, "out_weight")
     .additional_info("eevee_shared")
     .fragment_source("eevee_film_filter_frag.glsl")
-    .additional_info("draw_fullscreen");
+    .additional_info("draw_fullscreen", "draw_view");
 
 /** \} */
 
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_info.hh
index f06872d8c10..72071163826 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_lightprobe_info.hh
@@ -12,24 +12,24 @@ GPU_SHADER_INTERFACE_INFO(eevee_lightprobe_display_iface, "interp")
 
 GPU_SHADER_CREATE_INFO(eevee_lightprobe_display_cubemap)
     .do_static_compilation(true)
-    .uniform_buf(0, "LightProbeInfoData", "probes_buf")
-    .uniform_buf(1, "CubemapData", "cubes_buf[CULLING_ITEM_BATCH]")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(1, "LightProbeInfoData", "probes_buf")
+    .uniform_buf(2, "CubemapData", "cubes_buf[CULLING_ITEM_BATCH]")
     .sampler(0, ImageType::FLOAT_CUBE_ARRAY, "lightprobe_cube_tx")
     .vertex_out(eevee_lightprobe_display_iface)
     .fragment_out(0, Type::VEC4, "out_color")
-    .additional_info("eevee_shared")
     .vertex_source("eevee_lightprobe_display_cubemap_vert.glsl")
     .fragment_source("eevee_lightprobe_display_cubemap_frag.glsl");
 
 GPU_SHADER_CREATE_INFO(eevee_lightprobe_display_grid)
     .do_static_compilation(true)
-    .uniform_buf(0, "GridData", "grids_buf[GRID_MAX]")
-    .uniform_buf(1, "LightProbeInfoData", "probes_buf")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(1, "GridData", "grids_buf[GRID_MAX]")
+    .uniform_buf(2, "LightProbeInfoData", "probes_buf")
     .sampler(0, ImageType::FLOAT_2D_ARRAY, "lightprobe_grid_tx")
     .push_constant(Type::INT, "grid_id")
     .vertex_out(eevee_lightprobe_display_iface)
     .fragment_out(0, Type::VEC4, "out_color")
-    .additional_info("eevee_shared")
     .vertex_source("eevee_lightprobe_display_grid_vert.glsl")
     .fragment_source("eevee_lightprobe_display_grid_frag.glsl");
 
@@ -46,7 +46,7 @@ GPU_SHADER_INTERFACE_INFO(eevee_lightprobe_filter_iface, "interp")
 GPU_SHADER_CREATE_INFO(eevee_lightprobe_filter_diffuse)
     .do_static_compilation(true)
     .builtins(BuiltinBits::LAYER)
-    .uniform_buf(0, "LightProbeFilterData", "filter_buf")
+    .uniform_buf(1, "LightProbeFilterData", "filter_buf")
     .sampler(0, ImageType::FLOAT_CUBE, "radiance_tx")
     .fragment_out(0, Type::VEC4, "out_irradiance")
     .vertex_out(eevee_lightprobe_filter_iface)
@@ -58,7 +58,7 @@ GPU_SHADER_CREATE_INFO(eevee_lightprobe_filter_glossy)
     .do_static_compilation(true)
     .builtins(BuiltinBits::LAYER)
     .define("CUBEMAP")
-    .uniform_buf(0, "LightProbeFilterData", "filter_buf")
+    .uniform_buf(1, "LightProbeFilterData", "filter_buf")
     .sampler(0, ImageType::FLOAT_CUBE, "radiance_tx")
     .fragment_out(0, Type::VEC4, "out_irradiance")
     .vertex_out(eevee_lightprobe_filter_iface)
@@ -69,11 +69,11 @@ GPU_SHADER_CREATE_INFO(eevee_lightprobe_filter_glossy)
 GPU_SHADER_CREATE_INFO(eevee_lightprobe_filter_visibility)
     .do_static_compilation(true)
     .builtins(BuiltinBits::LAYER)
-    .uniform_buf(0, "LightProbeFilterData", "filter_buf")
+    .uniform_buf(1, "LightProbeFilterData", "filter_buf")
     .sampler(0, ImageType::DEPTH_CUBE, "depth_tx")
     .fragment_out(0, Type::VEC4, "out_visibility")
     .vertex_out(eevee_lightprobe_filter_iface)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .vertex_source("eevee_lightprobe_filter_vert.glsl")
     .fragment_source("eevee_lightprobe_filter_visibility_frag.glsl");
 
@@ -81,7 +81,7 @@ GPU_SHADER_CREATE_INFO(eevee_lightprobe_filter_downsample)
     .do_static_compilation(true)
     .builtins(BuiltinBits::LAYER)
     .define("CUBEMAP")
-    .uniform_buf(0, "LightProbeFilterData", "filter_buf")
+    .uniform_buf(1, "LightProbeFilterData", "filter_buf")
     .sampler(0, ImageType::FLOAT_CUBE, "input_tx")
     .fragment_out(0, Type::VEC4, "out_color")
     .vertex_out(eevee_lightprobe_filter_iface)
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_material_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_material_info.hh
index 248697cac6d..87e55862f50 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_material_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_material_info.hh
@@ -124,8 +124,8 @@ GPU_SHADER_CREATE_INFO(eevee_surface_background)
 
 GPU_SHADER_CREATE_INFO(eevee_background_lookdev)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
-    .uniform_buf(0, "LightProbeInfoData", "probes_buf")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(1, "LightProbeInfoData", "probes_buf")
     .sampler(0, ImageType::FLOAT_CUBE_ARRAY, "lightprobe_cube_tx")
     .push_constant(Type::FLOAT, "opacity")
     .push_constant(Type::FLOAT, "blur")
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur.hh
index bfd2f271a2d..35f67683ded 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_motion_blur.hh
@@ -3,20 +3,20 @@
 
 GPU_SHADER_CREATE_INFO(eevee_motion_blur_gather)
     .do_static_compilation(true)
-    .uniform_buf(0, "MotionBlurData", "mb_buf")
+    .additional_info("eevee_shared", "draw_view")
     .uniform_buf(1, "SamplingData", "sampling_buf")
+    .uniform_buf(2, "MotionBlurData", "mb_buf")
     .sampler(0, ImageType::FLOAT_2D, "color_tx")
     .sampler(1, ImageType::DEPTH_2D, "depth_tx")
     .sampler(2, ImageType::FLOAT_2D, "velocity_tx")
     .sampler(3, ImageType::FLOAT_2D, "tiles_tx")
     .fragment_out(0, Type::VEC4, "out_color")
-    .additional_info("eevee_shared")
     .fragment_source("eevee_motion_blur_gather_frag.glsl")
     .additional_info("draw_fullscreen");
 
 GPU_SHADER_CREATE_INFO(eevee_motion_blur_tiles_dilate)
     .do_static_compilation(true)
-    .uniform_buf(0, "MotionBlurData", "mb_buf")
+    .uniform_buf(1, "MotionBlurData", "mb_buf")
     .sampler(0, ImageType::FLOAT_2D, "tiles_tx")
     .fragment_out(0, Type::VEC4, "out_max_motion")
     .additional_info("eevee_shared")
@@ -25,7 +25,7 @@ GPU_SHADER_CREATE_INFO(eevee_motion_blur_tiles_dilate)
 
 GPU_SHADER_CREATE_INFO(eevee_motion_blur_tiles_flatten)
     .do_static_compilation(true)
-    .uniform_buf(0, "MotionBlurData", "mb_buf")
+    .uniform_buf(1, "MotionBlurData", "mb_buf")
     .sampler(0, ImageType::FLOAT_2D, "tiles_tx")
     .sampler(2, ImageType::FLOAT_2D, "velocity_tx")
     .fragment_out(0, Type::VEC4, "out_max_motion")
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_raytrace_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_raytrace_info.hh
index 0b7df946df7..24bf585c17b 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_raytrace_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_raytrace_info.hh
@@ -30,32 +30,34 @@ GPU_SHADER_CREATE_INFO(eevee_raytrace_fallback).define("SKIP_TRACE");
 
 GPU_SHADER_CREATE_INFO(eevee_raytrace_raygen)
     .additional_info("eevee_shared")
-    .uniform_buf(0, "RaytraceData", "raytrace_buf")
+    .uniform_buf(4, "RaytraceData", "raytrace_buf")
     .uniform_buf(1, "HiZData", "hiz_buf")
     .uniform_buf(2, "CubemapData", "cubes_buf[CULLING_ITEM_BATCH]")
     .uniform_buf(3, "LightProbeInfoData", "probes_buf")
-    .sampler(0, ImageType::FLOAT_2D, "hiz_tx")
-    .sampler(1, ImageType::FLOAT_2D, "hiz_front_tx")
     .sampler(2, ImageType::FLOAT_CUBE_ARRAY, "lightprobe_cube_tx")
     .sampler(3, ImageType::FLOAT_2D, "radiance_tx")
     .sampler(4, ImageType::FLOAT_2D, "combined_tx")
     .sampler(5, ImageType::FLOAT_2D, "cl_color_tx")
     .sampler(6, ImageType::FLOAT_2D, "cl_normal_tx")
     .sampler(7, ImageType::FLOAT_2D, "cl_data_tx")
+    .sampler(9, ImageType::FLOAT_2D, "hiz_tx")
+    .sampler(10, ImageType::FLOAT_2D, "hiz_front_tx")
     .fragment_out(0, Type::VEC4, "out_ray_data")
     .fragment_out(1, Type::VEC4, "out_ray_radiance")
     .fragment_source("eevee_raytrace_raygen_frag.glsl")
-    .additional_info("draw_fullscreen", "eevee_utility_texture", "eevee_sampling_data");
+    .additional_info("draw_fullscreen",
+                     "draw_view",
+                     "eevee_utility_texture",
+                     "eevee_sampling_data");
 
 EEVEE_RAYTRACE_SKIP_VARIATIONS(eevee_raytrace_raygen, "eevee_raytrace_raygen");
 
 GPU_SHADER_CREATE_INFO(eevee_raytrace_denoise)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .local_group_size(8, 8)
-    .uniform_buf(0, "RaytraceData", "raytrace_buf")
+    .uniform_buf(4, "RaytraceData", "raytrace_buf")
     .uniform_buf(1, "HiZData", "hiz_buf")
     .uniform_buf(2, "RaytraceBufferData", "rtbuf_buf")
-    .sampler(0, ImageType::FLOAT_2D, "hiz_tx")
     .sampler(1, ImageType::FLOAT_2D, "ray_data_tx")
     .sampler(2, ImageType::FLOAT_2D, "ray_radiance_tx")
     .sampler(3, ImageType::FLOAT_2D, "cl_color_tx")
@@ -63,6 +65,7 @@ GPU_SHADER_CREATE_INFO(eevee_raytrace_denoise)
     .sampler(5, ImageType::FLOAT_2D, "cl_data_tx")
     .sampler(6, ImageType::FLOAT_2D, "ray_history_tx")
     .sampler(7, ImageType::FLOAT_2D, "ray_variance_tx")
+    .sampler(8, ImageType::FLOAT_2D, "hiz_tx")
     .image(0, GPU_RGBA16F, Qualifier::READ_WRITE, ImageType::FLOAT_2D, "out_history_img")
     .image(1, GPU_R8, Qualifier::READ_WRITE, ImageType::FLOAT_2D, "out_variance_img")
     .compute_source("eevee_raytrace_denoise_comp.glsl");
@@ -70,7 +73,7 @@ GPU_SHADER_CREATE_INFO(eevee_raytrace_denoise)
 EEVEE_RAYTRACE_BSDF_VARIATIONS(eevee_raytrace_denoise, "eevee_raytrace_denoise");
 
 GPU_SHADER_CREATE_INFO(eevee_raytrace_resolve)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .uniform_buf(1, "HiZData", "hiz_buf")
     .sampler(2, ImageType::FLOAT_2D, "ray_radiance_tx")
     .sampler(3, ImageType::FLOAT_2D, "cl_color_tx")
@@ -92,7 +95,7 @@ EEVEE_RAYTRACE_BSDF_VARIATIONS(eevee_raytrace_resolve, "eevee_raytrace_resolve")
  * \{ */
 
 GPU_SHADER_CREATE_INFO(eevee_raytrace_data)
-    .uniform_buf(0, "RaytraceData", "raytrace_diffuse")
+    .uniform_buf(4, "RaytraceData", "raytrace_diffuse")
     .uniform_buf(1, "RaytraceData", "raytrace_reflection")
     .uniform_buf(2, "RaytraceData", "raytrace_refraction")
     .uniform_buf(3, "HiZData", "hiz_buf")
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_info.hh
index 41d6627af79..739c59a4280 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_shadow_info.hh
@@ -11,7 +11,7 @@
 
 GPU_SHADER_CREATE_INFO(eevee_shadow_page_alloc)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .local_group_size(SHADOW_TILEMAP_RES, SHADOW_TILEMAP_RES)
     .storage_buf(1, Qualifier::READ, "ShadowTileMapData", "tilemaps_buf[]")
     .storage_buf(2, Qualifier::READ_WRITE, "uint", "pages_free_buf[]")
@@ -34,7 +34,7 @@ GPU_SHADER_CREATE_INFO(eevee_shadow_page_copy)
 
 GPU_SHADER_CREATE_INFO(eevee_shadow_page_defrag)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .local_group_size(1)
     .storage_buf(0, Qualifier::READ_WRITE, "uint", "pages_free_buf[]")
     .storage_buf(1, Qualifier::READ_WRITE, "ShadowPagesInfoData", "pages_infos_buf")
@@ -71,7 +71,7 @@ GPU_SHADER_CREATE_INFO(eevee_shadow_page_mark)
 
 GPU_SHADER_CREATE_INFO(eevee_shadow_tilemap_depth_scan)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .local_group_size(SHADOW_DEPTH_SCAN_GROUP_SIZE, SHADOW_DEPTH_SCAN_GROUP_SIZE)
     .image(0, GPU_R32UI, Qualifier::READ_WRITE, ImageType::UINT_2D, "tilemaps_img")
     .sampler(0, ImageType::DEPTH_2D, "depth_tx")
@@ -100,7 +100,7 @@ GPU_SHADER_CREATE_INFO(eevee_shadow_tilemap_setup)
     .compute_source("eevee_shadow_tilemap_setup_comp.glsl");
 
 GPU_SHADER_CREATE_INFO(eevee_shadow_tilemap_tag)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .local_group_size(SHADOW_AABB_TAG_GROUP_SIZE)
     /* NOTE(@fclem): Use an array of vec3 to avoid possible layout confusion. */
     .storage_buf(1, Qualifier::READ, "vec3", "aabbs_buf[]")
@@ -123,7 +123,7 @@ GPU_SHADER_CREATE_INFO(eevee_shadow_tilemap_tag_update)
 
 GPU_SHADER_CREATE_INFO(eevee_shadow_tilemap_visibility)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
+    .additional_info("eevee_shared", "draw_view")
     .local_group_size(SHADOW_TILEMAP_RES, SHADOW_TILEMAP_RES)
     .storage_buf(2, Qualifier::READ, "ShadowTileMapData", "tilemaps_buf[]")
     .image(0, GPU_R32UI, Qualifier::READ_WRITE, ImageType::UINT_2D, "tilemaps_img")
@@ -158,8 +158,8 @@ GPU_SHADER_CREATE_INFO(eevee_shadow_page_debug)
 
 GPU_SHADER_CREATE_INFO(eevee_shadow_debug)
     .do_static_compilation(true)
-    .additional_info("eevee_shared")
-    .uniform_buf(0, "ShadowDebugData", "debug")
+    .additional_info("eevee_shared", "draw_view")
+    .uniform_buf(1, "ShadowDebugData", "debug")
     .storage_buf(0, Qualifier::READ, "ShadowTileMapData", "tilemaps_buf[]")
     .sampler(0, ImageType::DEPTH_2D, "depth_tx")
     .sampler(1, ImageType::FLOAT_2D, "atlas_tx")
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_info.hh
index 30a9b98eef8..e676e15346c 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_subsurface_info.hh
@@ -7,7 +7,7 @@ GPU_SHADER_CREATE_INFO(eevee_transmittance_data)
 GPU_SHADER_CREATE_INFO(eevee_subsurface_eval)
     .do_static_compilation(true)
     .additional_info("eevee_shared")
-    .uniform_buf(0, "SubsurfaceData", "sss_buf")
+    .uniform_buf(2, "SubsurfaceData", "sss_buf")
     .uniform_buf(1, "HiZData", "hiz_buf")
     .sampler(0, ImageType::FLOAT_2D, "hiz_tx")
     .sampler(1, ImageType::FLOAT_2D, "radiance_tx")
@@ -17,4 +17,4 @@ GPU_SHADER_CREATE_INFO(eevee_subsurface_eval)
     .fragment_out(0, Type::VEC4, "out_combined")
     .fragment_source("eevee_subsurface_eval_frag.glsl")
     /* TODO(fclem) Output to diffuse pass without feedback loop. */
-    .additional_info("draw_fullscreen");
+    .additional_info("draw_fullscreen", "draw_view");
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_info.hh
index 4b8dafb59b1..20af6b7f0d7 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_velocity_info.hh
@@ -7,7 +7,7 @@
 
 GPU_SHADER_CREATE_INFO(eevee_velocity_camera)
     .do_static_compilation(true)
-    .uniform_buf(0, "CameraData", "cam_prev")
+    .uniform_buf(3, "CameraData", "cam_prev")
     .uniform_buf(1, "CameraData", "cam_curr")
     .uniform_buf(2, "CameraData", "cam_next")
     .sampler(0, ImageType::DEPTH_2D, "depth_tx")
@@ -15,7 +15,7 @@ GPU_SHADER_CREATE_INFO(eevee_velocity_camera)
     .fragment_out(1, Type::VEC4, "out_velocity_view")
     .additional_info("eevee_shared")
     .fragment_source("eevee_velocity_camera_frag.glsl")
-    .additional_info("draw_fullscreen");
+    .additional_info("draw_fullscreen", "draw_view");
 
 /** \} */