[Bf-blender-cvs] [c920f26fcc3] temp-eevee-next-cryptomatte: Renamed DISPLAY_MODE_ to PASS_STORAGE_

[Jeroen Bakker]

Commit: c920f26fcc3858b293b4c4a02be1972d70b84584
Author: Jeroen Bakker
Date:   Fri Sep 2 08:32:33 2022 +0200
Branches: temp-eevee-next-cryptomatte
https://developer.blender.org/rBc920f26fcc3858b293b4c4a02be1972d70b84584

Renamed DISPLAY_MODE_ to PASS_STORAGE_

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

M	source/blender/draw/engines/eevee_next/eevee_film.cc
M	source/blender/draw/engines/eevee_next/eevee_film.hh
M	source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
M	source/blender/draw/engines/eevee_next/shaders/eevee_film_frag.glsl

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

diff --git a/source/blender/draw/engines/eevee_next/eevee_film.cc b/source/blender/draw/engines/eevee_next/eevee_film.cc
index dec40a9cdc0..f0fdac24e85 100644
--- a/source/blender/draw/engines/eevee_next/eevee_film.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_film.cc
@@ -291,7 +291,7 @@ void Film::init(const int2 &extent, const rcti *output_rect)
     /* Set pass offsets.  */
 
     data_.display_id = aovs_info.display_id;
-    data_.display_mode = aovs_info.display_is_value ? DISPLAY_MODE_VALUE : DISPLAY_MODE_COLOR;
+    data_.storage_type = aovs_info.display_is_value ? PASS_STORAGE_VALUE : PASS_STORAGE_COLOR;
 
     /* Combined is in a separate buffer. */
     data_.combined_id = (enabled_passes_ & EEVEE_RENDER_PASS_COMBINED) ? 0 : -1;
@@ -302,13 +302,13 @@ void Film::init(const int2 &extent, const rcti *output_rect)
     data_.value_len = 0;
 
     auto pass_index_get = [&](eViewLayerEEVEEPassType pass_type) {
-      eDisplayMode display_mode = pass_display_mode(pass_type);
+      ePassStorageType storage_type = pass_storage_type(pass_type);
       int index = (enabled_passes_ & pass_type) ?
-                      (display_mode == DISPLAY_MODE_VALUE ? data_.value_len : data_.color_len)++ :
+                      (storage_type == PASS_STORAGE_VALUE ? data_.value_len : data_.color_len)++ :
                       -1;
       if (inst_.is_viewport() && inst_.v3d->shading.render_pass == pass_type) {
         data_.display_id = index;
-        data_.display_mode = display_mode;
+        data_.storage_type = storage_type;
       }
       return index;
     };
@@ -344,7 +344,7 @@ void Film::init(const int2 &extent, const rcti *output_rect)
 
         if (inst_.is_viewport() && inst_.v3d->shading.render_pass == pass_type) {
           data_.display_id = index;
-          data_.display_mode = DISPLAY_MODE_CRYPTOMATTE;
+          data_.storage_type = PASS_STORAGE_CRYPTOMATTE;
         }
       }
       return index;
@@ -697,9 +697,9 @@ void Film::cryptomatte_sort()
 
 float *Film::read_pass(eViewLayerEEVEEPassType pass_type, int layer_offset)
 {
-  eDisplayMode pass_mode = pass_display_mode(pass_type);
-  const bool is_value = pass_mode == DISPLAY_MODE_VALUE;
-  const bool is_cryptomatte = pass_mode == DISPLAY_MODE_CRYPTOMATTE;
+  ePassStorageType storage_type = pass_storage_type(pass_type);
+  const bool is_value = storage_type == PASS_STORAGE_VALUE;
+  const bool is_cryptomatte = storage_type == PASS_STORAGE_CRYPTOMATTE;
 
   Texture &accum_tx = (pass_type == EEVEE_RENDER_PASS_COMBINED) ?
                           combined_tx_.current() :
diff --git a/source/blender/draw/engines/eevee_next/eevee_film.hh b/source/blender/draw/engines/eevee_next/eevee_film.hh
index 7ec405d8a58..11b038dea18 100644
--- a/source/blender/draw/engines/eevee_next/eevee_film.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_film.hh
@@ -105,20 +105,20 @@ class Film {
   int cryptomatte_layer_max_get() const;
   int cryptomatte_layer_len_get() const;
 
-  static eDisplayMode pass_display_mode(eViewLayerEEVEEPassType pass_type)
+  static ePassStorageType pass_storage_type(eViewLayerEEVEEPassType pass_type)
   {
     switch (pass_type) {
       case EEVEE_RENDER_PASS_Z:
       case EEVEE_RENDER_PASS_MIST:
       case EEVEE_RENDER_PASS_SHADOW:
       case EEVEE_RENDER_PASS_AO:
-        return DISPLAY_MODE_VALUE;
+        return PASS_STORAGE_VALUE;
       case EEVEE_RENDER_PASS_CRYPTOMATTE_OBJECT:
       case EEVEE_RENDER_PASS_CRYPTOMATTE_ASSET:
       case EEVEE_RENDER_PASS_CRYPTOMATTE_MATERIAL:
-        return DISPLAY_MODE_CRYPTOMATTE;
+        return PASS_STORAGE_CRYPTOMATTE;
       default:
-        return DISPLAY_MODE_COLOR;
+        return PASS_STORAGE_COLOR;
     }
   }
 
diff --git a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
index 564cbbc4da5..5426743c198 100644
--- a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
@@ -194,10 +194,10 @@ BLI_STATIC_ASSERT_ALIGN(CameraData, 16)
 
 #define FILM_PRECOMP_SAMPLE_MAX 16
 
-enum eDisplayMode : uint32_t {
-  DISPLAY_MODE_COLOR = 0u,
-  DISPLAY_MODE_VALUE = 1u,
-  DISPLAY_MODE_CRYPTOMATTE = 2u,
+enum ePassStorageType : uint32_t {
+  PASS_STORAGE_COLOR = 0u,
+  PASS_STORAGE_VALUE = 1u,
+  PASS_STORAGE_CRYPTOMATTE = 2u,
 };
 
 struct FilmSample {
@@ -256,8 +256,8 @@ struct FilmData {
   int combined_id;
   /** Id of the render-pass to be displayed. -1 for combined. */
   int display_id;
-  /** True if the render-pass to be displayed is from the value accum buffer. */
-  int display_mode;
+  /** Storage type of the render-pass to be displayed (ePassStorageType). */
+  int storage_type;
   /** True if we bypass the accumulation and directly output the accumulation buffer. */
   bool1 display_only;
   /** Start of AOVs and number of aov. */
diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_film_frag.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_film_frag.glsl
index 0e9bf27571a..8e1ed77b639 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_film_frag.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_film_frag.glsl
@@ -13,14 +13,14 @@ void main()
     if (film_buf.display_id == -1) {
       out_color = texelFetch(in_combined_tx, texel_film, 0);
     }
-    else if (film_buf.display_mode == DISPLAY_MODE_VALUE) {
+    else if (film_buf.storage_type == PASS_STORAGE_VALUE) {
       out_color.rgb = imageLoad(value_accum_img, ivec3(texel_film, film_buf.display_id)).rrr;
       out_color.a = 1.0;
     }
-    else if (film_buf.display_mode == DISPLAY_MODE_COLOR) {
+    else if (film_buf.storage_type == PASS_STORAGE_COLOR) {
       out_color = imageLoad(color_accum_img, ivec3(texel_film, film_buf.display_id));
     }
-    else /* DISPLAY_MODE_CRYPTOMATTE */ {
+    else /* PASS_STORAGE_CRYPTOMATTE */ {
       out_color = cryptomatte_false_color(
           imageLoad(cryptomatte_img, ivec3(texel_film, film_buf.display_id)).r);
     }