[Bf-blender-cvs] [86015a31a16] temp-eevee-next-cryptomatte: Include shader shared in cryptomatte post.

[Jeroen Bakker]

Commit: 86015a31a16e27b2ad09c8e0ad49123edf6d8377
Author: Jeroen Bakker
Date:   Fri Sep 2 11:47:42 2022 +0200
Branches: temp-eevee-next-cryptomatte
https://developer.blender.org/rB86015a31a16e27b2ad09c8e0ad49123edf6d8377

Include shader shared in cryptomatte post.

===================================================================

M	source/blender/draw/engines/eevee_next/shaders/eevee_film_cryptomatte_post_comp.glsl
M	source/blender/draw/engines/eevee_next/shaders/infos/eevee_film_info.hh

===================================================================

diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_film_cryptomatte_post_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_film_cryptomatte_post_comp.glsl
index fd98240639e..120edd9c35e 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_film_cryptomatte_post_comp.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_film_cryptomatte_post_comp.glsl
@@ -67,8 +67,9 @@ void main()
     cryptomatte_load_samples(texel, layer, samples);
     cryptomatte_sort_samples(samples);
     /* Repeat texture coordinates as the weight can be optimized to a small portion of the film. */
-    float weight = imageLoad(weight_img,
-                             ivec3(texel % imageSize(weight_img).xy, 0))
+    float weight = imageLoad(
+                       weight_img,
+                       ivec3(texel % imageSize(weight_img).xy, FILM_WEIGHT_LAYER_ACCUMULATION))
                        .x;
     cryptomatte_normalize_weight(weight, samples);
     cryptomatte_store_samples(texel, layer, samples);
diff --git a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_film_info.hh b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_film_info.hh
index 072d3b1db2d..99cacc6b03a 100644
--- a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_film_info.hh
+++ b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_film_info.hh
@@ -50,8 +50,9 @@ GPU_SHADER_CREATE_INFO(eevee_film_comp)
 GPU_SHADER_CREATE_INFO(eevee_film_cryptomatte_post)
     .do_static_compilation(true)
     .image(0, GPU_RGBA32F, Qualifier::READ_WRITE, ImageType::FLOAT_2D_ARRAY, "cryptomatte_img")
-    .image(0, GPU_R32F, Qualifier::READ, ImageType::FLOAT_2D_ARRAY, "weight_img")
+    .image(1, GPU_R32F, Qualifier::READ, ImageType::FLOAT_2D_ARRAY, "weight_img")
     .push_constant(Type::INT, "cryptomatte_layer_len")
     .push_constant(Type::INT, "cryptomatte_samples_per_layer")
     .local_group_size(FILM_GROUP_SIZE, FILM_GROUP_SIZE)
-    .compute_source("eevee_film_cryptomatte_post_comp.glsl");
+    .compute_source("eevee_film_cryptomatte_post_comp.glsl")
+    .additional_info("eevee_shared");