From dcef32ec9b579b4d72cfb1875b74b9b059028eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cle=CC=81ment=20Foucault?= Date: Mon, 22 Jul 2024 15:06:59 +0200 Subject: [PATCH] EEVEE: Fix broken cryptomatte shader compilation Was caused by a missing resource. --- source/blender/draw/engines/eevee_next/eevee_film.cc | 1 + .../draw/engines/eevee_next/shaders/infos/eevee_film_info.hh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/draw/engines/eevee_next/eevee_film.cc b/source/blender/draw/engines/eevee_next/eevee_film.cc index 0b0f43daa43..77ec041d792 100644 --- a/source/blender/draw/engines/eevee_next/eevee_film.cc +++ b/source/blender/draw/engines/eevee_next/eevee_film.cc @@ -470,6 +470,7 @@ void Film::sync() cryptomatte_post_ps_.shader_set(inst_.shaders.static_shader_get(FILM_CRYPTOMATTE_POST)); cryptomatte_post_ps_.bind_image("cryptomatte_img", &cryptomatte_tx_); cryptomatte_post_ps_.bind_image("weight_img", &weight_tx_.current()); + cryptomatte_post_ps_.bind_resources(inst_.uniform_data); cryptomatte_post_ps_.push_constant("cryptomatte_layer_len", cryptomatte_layer_count); cryptomatte_post_ps_.push_constant("cryptomatte_samples_per_layer", inst_.view_layer->cryptomatte_levels); 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 cc0e8cff6da..bd357a6b171 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 @@ -59,7 +59,7 @@ GPU_SHADER_CREATE_INFO(eevee_film_cryptomatte_post) .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") - .additional_info("eevee_shared"); + .additional_info("eevee_global_ubo", "eevee_shared"); GPU_SHADER_CREATE_INFO(eevee_film_copy_frag) .do_static_compilation(true)