Commit: 4c1ddd229a67a7da466e70570181506eb4e32137
Author: Jeroen Bakker
Date: Mon Aug 29 14:47:08 2022 +0200
Branches: temp-eevee-next-cryptomatte
https://developer.blender.org/rB4c1ddd229a67a7da466e70570181506eb4e32137
Use C-style comments.
===================================================================
M
source/blender/draw/engines/eevee_next/shaders/eevee_cryptomatte_lib.glsl
M
source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh
===================================================================
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 38c62718fca..9c8ccbcb1cb 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
@@ -52,8 +52,8 @@ void cryptomatte_store_film_sample(FilmSample dst,
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
- // will ignore this sample, but ideally we could replace a sample with a
lowest weight.
+ /* TODO(jbakker): New hash detected, but there is no space left to store
it. Currently we
+ * will ignore this sample, but ideally we could replace a sample with a
lowest weight. */
continue;
}
else {
diff --git
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
index abb41dc046e..520310069c8 100644
---
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
@@ -82,11 +82,9 @@ GPU_SHADER_CREATE_INFO(eevee_aov_out)
.image_array_out(6, Qualifier::WRITE, GPU_R16F, "aov_value_img")
.storage_buf(7, Qualifier::READ, "AOVsInfoData", "aov_buf");
-GPU_SHADER_CREATE_INFO(eevee_cryptomatte_in)
- .push_constant(Type::FLOAT, "cryptomatte_material_hash")
- .storage_buf(8, Qualifier::READ, "vec2", "cryptomatte_object_buf[]",
Frequency::PASS);
-
GPU_SHADER_CREATE_INFO(eevee_cryptomatte_out)
+ .push_constant(Type::FLOAT, "cryptomatte_material_hash")
+ .storage_buf(8, Qualifier::READ, "vec2", "cryptomatte_object_buf[]",
Frequency::PASS)
.image_out(7, Qualifier::WRITE, GPU_RGBA32F, "rp_cryptomatte_img");
GPU_SHADER_CREATE_INFO(eevee_surf_deferred)
@@ -125,7 +123,6 @@ GPU_SHADER_CREATE_INFO(eevee_surf_forward)
.image_out(3, Qualifier::READ_WRITE, GPU_RGBA16F, "rp_specular_color_img")
.image_out(4, Qualifier::READ_WRITE, GPU_RGBA16F, "rp_emission_img")
.additional_info("eevee_aov_out",
- "eevee_cryptomatte_in",
"eevee_cryptomatte_out",
"eevee_light_data",
"eevee_utility_texture",
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
