[Bf-blender-cvs] [ea01e012ad6] temp-eevee-next-cryptomatte: Merge branch 'master' into temp-eevee-next-cryptomatte

[Jeroen Bakker]

Commit: ea01e012ad646dfa707e137188143c5d09a1940a
Author: Jeroen Bakker
Date:   Mon Aug 15 15:20:35 2022 +0200
Branches: temp-eevee-next-cryptomatte
https://developer.blender.org/rBea01e012ad646dfa707e137188143c5d09a1940a

Merge branch 'master' into temp-eevee-next-cryptomatte

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



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

diff --cc source/blender/draw/engines/eevee_next/eevee_instance.hh
index 1fc0eba89d2,d52e4a8e43b..68fab49baf5
--- a/source/blender/draw/engines/eevee_next/eevee_instance.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_instance.hh
@@@ -16,9 -16,9 +16,10 @@@
  #include "DRW_render.h"
  
  #include "eevee_camera.hh"
 +#include "eevee_cryptomatte.hh"
  #include "eevee_depth_of_field.hh"
  #include "eevee_film.hh"
+ #include "eevee_light.hh"
  #include "eevee_material.hh"
  #include "eevee_motion_blur.hh"
  #include "eevee_pipeline.hh"
diff --cc source/blender/draw/engines/eevee_next/eevee_view.cc
index 2344a859550,b7154465a70..840073c22f8
--- a/source/blender/draw/engines/eevee_next/eevee_view.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_view.cc
@@@ -128,11 -131,8 +131,10 @@@ void ShadingView::render(
    inst_.pipelines.forward.render(
        render_view_, prepass_fb_, combined_fb_, rbufs.depth_tx, rbufs.combined_tx);
  
-   // inst_.lights.debug_draw(view_fb_);
-   // inst_.shadows.debug_draw(view_fb_);
+   inst_.lights.debug_draw(combined_fb_);
  
 +  inst_.cryptomatte.render();
 +
    GPUTexture *combined_final_tx = render_postfx(rbufs.combined_tx);
  
    inst_.film.accumulate(sub_view_, combined_final_tx);
diff --cc source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh
index 7f6dbf2cecf,6929dec1150..fcb97880f24
--- a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh
+++ b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh
@@@ -121,8 -118,10 +123,11 @@@ GPU_SHADER_CREATE_INFO(eevee_surf_forwa
      .image_out(3, Qualifier::READ_WRITE, GPU_RGBA16F, "rp_specular_light_img")
      .image_out(4, Qualifier::READ_WRITE, GPU_RGBA16F, "rp_specular_color_img")
      .image_out(5, Qualifier::READ_WRITE, GPU_RGBA16F, "rp_emission_img")
-     .additional_info("eevee_aov_out", "eevee_cryptomatte_out"
-                      //  "eevee_sampling_data",
+     .additional_info("eevee_aov_out",
++                     "eevee_cryptomatte_out",
+                      "eevee_light_data",
+                      "eevee_utility_texture",
+                      "eevee_sampling_data"
                       //  "eevee_lightprobe_data",
                       /* Optionally added depending on the material. */
                       // "eevee_raytrace_data",
diff --cc source/blender/gpu/CMakeLists.txt
index a2d19c9b3f1,1d67b5be4fb..d6db12621ce
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -493,9 -493,9 +493,10 @@@ list(APPEND INC ${CMAKE_CURRENT_BINARY_
  
  set(SRC_SHADER_CREATE_INFOS
    ../draw/engines/basic/shaders/infos/basic_depth_info.hh
 +  ../draw/engines/eevee_next/shaders/infos/eevee_cryptomatte_info.hh
    ../draw/engines/eevee_next/shaders/infos/eevee_depth_of_field_info.hh
    ../draw/engines/eevee_next/shaders/infos/eevee_film_info.hh
+   ../draw/engines/eevee_next/shaders/infos/eevee_light_culling_info.hh
    ../draw/engines/eevee_next/shaders/infos/eevee_material_info.hh
    ../draw/engines/eevee_next/shaders/infos/eevee_motion_blur_info.hh
    ../draw/engines/eevee_next/shaders/infos/eevee_velocity_info.hh