Merge branch 'blender-v4.3-release'

source/blender/compositor/realtime_compositor/shaders/compositor_cryptomatte_matte.glsl

@@ -17,7 +17,7 @@
 void main()
 {
   ivec2 texel = ivec2(gl_GlobalInvocationID.xy);
-  vec4 layer = texture_load(layer_tx, texel);
+  vec4 layer = texture_load(layer_tx, texel + lower_bound);
 
   /* Each Cryptomatte layer stores two ranks. */
   vec2 first_rank = layer.xy;

source/blender/compositor/realtime_compositor/shaders/compositor_cryptomatte_pick.glsl

@@ -30,7 +30,7 @@ void main()
 
   /* Each layer stores two ranks, each rank contains a pair, the identifier and the coverage of
    * the entity identified by the identifier. */
-  vec2 first_rank = texture_load(first_layer_tx, texel).xy;
+  vec2 first_rank = texture_load(first_layer_tx, texel + lower_bound).xy;
   float id_of_first_rank = first_rank.x;
 
   /* There is no logic to this, we just compute arbitrary compressed versions of the identifier in

source/blender/compositor/realtime_compositor/shaders/infos/compositor_cryptomatte_info.hh

@@ -6,6 +6,7 @@
 
 GPU_SHADER_CREATE_INFO(compositor_cryptomatte_pick)
 LOCAL_GROUP_SIZE(16, 16)
+PUSH_CONSTANT(IVEC2, lower_bound)
 SAMPLER(0, FLOAT_2D, first_layer_tx)
 IMAGE(0, GPU_RGBA32F, WRITE, FLOAT_2D, output_img)
 COMPUTE_SOURCE("compositor_cryptomatte_pick.glsl")
@@ -14,6 +15,7 @@ GPU_SHADER_CREATE_END()
 
 GPU_SHADER_CREATE_INFO(compositor_cryptomatte_matte)
 LOCAL_GROUP_SIZE(16, 16)
+PUSH_CONSTANT(IVEC2, lower_bound)
 PUSH_CONSTANT(INT, identifiers_count)
 PUSH_CONSTANT_ARRAY(FLOAT, identifiers, 32)
 SAMPLER(0, FLOAT_2D, layer_tx)

source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc

@@ -238,6 +238,13 @@ class BaseCryptoMatteOperation : public NodeOperation {
   /* Should returns all the Cryptomatte layers in order. */
   virtual Vector<GPUTexture *> get_layers() = 0;
 
+  /* If only a subset area of the Cryptomatte layers is to be considered, this method should return
+   * the lower bound of that area. The upper bound will be derived from the operation domain. */
+  virtual int2 get_layers_lower_bound()
+  {
+    return int2(0);
+  }
+
   void execute() override
   {
     /* Not yet supported on CPU. */
@@ -308,6 +315,9 @@ class BaseCryptoMatteOperation : public NodeOperation {
     GPUShader *shader = context().get_shader("compositor_cryptomatte_pick", ResultPrecision::Full);
     GPU_shader_bind(shader);
 
+    const int2 lower_bound = this->get_layers_lower_bound();
+    GPU_shader_uniform_2iv(shader, "lower_bound", lower_bound);
+
     GPUTexture *first_layer = layers[0];
     const int input_unit = GPU_shader_get_sampler_binding(shader, "first_layer_tx");
     GPU_texture_bind(first_layer, input_unit);
@@ -352,6 +362,8 @@ class BaseCryptoMatteOperation : public NodeOperation {
     GPUShader *shader = context().get_shader("compositor_cryptomatte_matte");
     GPU_shader_bind(shader);
 
+    const int2 lower_bound = this->get_layers_lower_bound();
+    GPU_shader_uniform_2iv(shader, "lower_bound", lower_bound);
     GPU_shader_uniform_1i(shader, "identifiers_count", identifiers.size());
     GPU_shader_uniform_1f_array(shader, "identifiers", identifiers.size(), identifiers.data());
 
@@ -666,13 +678,28 @@ class CryptoMatteOperation : public BaseCryptoMatteOperation {
     return std::string(type_name);
   }
 
+  int2 get_layers_lower_bound() override
+  {
+    switch (get_source()) {
+      case CMP_NODE_CRYPTOMATTE_SOURCE_RENDER: {
+        const rcti compositing_region = this->context().get_compositing_region();
+        return int2(compositing_region.xmin, compositing_region.ymin);
+      }
+      case CMP_NODE_CRYPTOMATTE_SOURCE_IMAGE:
+        return int2(0);
+    }
+
+    BLI_assert_unreachable();
+    return int2(0);
+  }
+
   /* The domain should be centered with the same size as the source. In case of invalid source,
    * fallback to the domain inferred from the input. */
   Domain compute_domain() override
   {
     switch (get_source()) {
       case CMP_NODE_CRYPTOMATTE_SOURCE_RENDER:
-        return Domain(context().get_render_size());
+        return Domain(context().get_compositing_region_size());
       case CMP_NODE_CRYPTOMATTE_SOURCE_IMAGE:
         return compute_image_domain();
     }