[Bf-blender-cvs] [8b0acf063c9] temp-eevee-next-cryptomatte: Use cryptomatte_ prefix.

[Jeroen Bakker]

Commit: 8b0acf063c9542a0ccae8bdd85617417ce3aa8e7
Author: Jeroen Bakker
Date:   Mon Aug 29 14:27:58 2022 +0200
Branches: temp-eevee-next-cryptomatte
https://developer.blender.org/rB8b0acf063c9542a0ccae8bdd85617417ce3aa8e7

Use cryptomatte_ prefix.

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

M	source/blender/draw/engines/eevee_next/shaders/eevee_cryptomatte_lib.glsl
M	source/blender/draw/engines/eevee_next/shaders/eevee_film_lib.glsl

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

diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_cryptomatte_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_cryptomatte_lib.glsl
index 64473eb24a3..256b0a8d428 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_cryptomatte_lib.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_cryptomatte_lib.glsl
@@ -1,6 +1,6 @@
 /** Storing/merging and sorting cryptomatte samples. */
 
-bool can_merge_cryptomatte_sample(vec2 cryptomatte_sample, float hash)
+bool cryptomatte_can_merge_sample(vec2 cryptomatte_sample, float hash)
 {
   if (cryptomatte_sample == vec2(0.0, 0.0)) {
     return true;
@@ -11,7 +11,7 @@ bool can_merge_cryptomatte_sample(vec2 cryptomatte_sample, float hash)
   return false;
 }
 
-vec2 merge_cryptomatte_sample(vec2 cryptomatte_sample, float hash, float weight)
+vec2 cryptomatte_merge_sample(vec2 cryptomatte_sample, float hash, float weight)
 {
   return vec2(hash, cryptomatte_sample.y + weight);
 }
@@ -25,7 +25,7 @@ vec4 cryptomatte_false_color(float hash)
       hash, float(m3hash << 8) / float(UINT32_MAX), float(m3hash << 16) / float(UINT32_MAX), 1.0);
 }
 
-void film_store_cryptomatte_sample(FilmSample dst,
+void cryptomatte_store_film_sample(FilmSample dst,
                                    int cryptomatte_layer_id,
                                    float hash,
                                    out vec4 out_color)
@@ -42,14 +42,14 @@ void film_store_cryptomatte_sample(FilmSample dst,
   for (int i = 0; i < film_buf.cryptomatte_samples_len / 2; i++) {
     ivec3 img_co = ivec3(dst.texel, cryptomatte_layer_id + i);
     vec4 sample_pair = imageLoad(cryptomatte_img, img_co);
-    if (can_merge_cryptomatte_sample(sample_pair.xy, hash)) {
-      sample_pair.xy = merge_cryptomatte_sample(sample_pair.xy, hash, weight);
+    if (cryptomatte_can_merge_sample(sample_pair.xy, hash)) {
+      sample_pair.xy = cryptomatte_merge_sample(sample_pair.xy, hash, weight);
       if (i == 0) {
         out_color = cryptomatte_false_color(sample_pair.x);
       }
     }
-    else if (can_merge_cryptomatte_sample(sample_pair.zw, hash)) {
-      sample_pair.zw = merge_cryptomatte_sample(sample_pair.zw, hash, weight);
+    else if (cryptomatte_can_merge_sample(sample_pair.zw, hash)) {
+      sample_pair.zw = cryptomatte_merge_sample(sample_pair.zw, hash, weight);
     }
     else if (i == film_buf.cryptomatte_samples_len / 2 - 1) {
       // TODO(jbakker): New hash detected, but there is no space left to store it. Currently we
diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_film_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_film_lib.glsl
index c77b7d51d43..92a873f3af9 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_film_lib.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_film_lib.glsl
@@ -706,13 +706,13 @@ void film_process_data(ivec2 texel_film, out vec4 out_color, out float out_depth
   if (film_buf.cryptomatte_samples_len != 0) {
     vec4 hashes = texelFetch(cryptomatte_tx, dst.texel, 0);
     if (film_buf.cryptomatte_object_id != -1) {
-      film_store_cryptomatte_sample(dst, film_buf.cryptomatte_object_id, hashes.x, out_color);
+      cryptomatte_store_film_sample(dst, film_buf.cryptomatte_object_id, hashes.x, out_color);
     }
     if (film_buf.cryptomatte_asset_id != -1) {
-      film_store_cryptomatte_sample(dst, film_buf.cryptomatte_asset_id, hashes.y, out_color);
+      cryptomatte_store_film_sample(dst, film_buf.cryptomatte_asset_id, hashes.y, out_color);
     }
     if (film_buf.cryptomatte_material_id != -1) {
-      film_store_cryptomatte_sample(dst, film_buf.cryptomatte_material_id, hashes.z, out_color);
+      cryptomatte_store_film_sample(dst, film_buf.cryptomatte_material_id, hashes.z, out_color);
     }
   }
 }