summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-09-29 19:47:29 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-09-29 19:47:29 +0200
commitdd3dda797cb258de5c0cc3c9a93c16ae215ac667 (patch)
tree1a98a0443f2f96237d294520bbceea0a64943f6f
parent0cd47310f2f31b6efb61742d94c0010b58f3930a (diff)
parentac90ca714c29f110ccbd3bb89a15f6da726c3203 (diff)
downloadredot-engine-dd3dda797cb258de5c0cc3c9a93c16ae215ac667.tar.gz
Merge pull request #82533 from DarioSamo/no-dilate-before-denoise
Make the lightmapper not dilate before denoising.
-rw-r--r--modules/lightmapper_rd/lightmapper_rd.cpp20
1 files changed, 6 insertions, 14 deletions
diff --git a/modules/lightmapper_rd/lightmapper_rd.cpp b/modules/lightmapper_rd/lightmapper_rd.cpp
index e9550f9c28..556b0b4374 100644
--- a/modules/lightmapper_rd/lightmapper_rd.cpp
+++ b/modules/lightmapper_rd/lightmapper_rd.cpp
@@ -1493,14 +1493,6 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
}
#endif
- {
- SWAP(light_accum_tex, light_accum_tex2);
- BakeError error = _dilate(rd, compute_shader, compute_base_uniform_set, push_constant, light_accum_tex2, light_accum_tex, atlas_size, atlas_slices * (p_bake_sh ? 4 : 1));
- if (unlikely(error != BAKE_OK)) {
- return error;
- }
- }
-
/* DENOISE */
if (p_use_denoiser) {
@@ -1515,13 +1507,13 @@ LightmapperRD::BakeError LightmapperRD::bake(BakeQuality p_quality, bool p_use_d
return error;
}
}
+ }
- {
- SWAP(light_accum_tex, light_accum_tex2);
- BakeError error = _dilate(rd, compute_shader, compute_base_uniform_set, push_constant, light_accum_tex2, light_accum_tex, atlas_size, atlas_slices * (p_bake_sh ? 4 : 1));
- if (unlikely(error != BAKE_OK)) {
- return error;
- }
+ {
+ SWAP(light_accum_tex, light_accum_tex2);
+ BakeError error = _dilate(rd, compute_shader, compute_base_uniform_set, push_constant, light_accum_tex2, light_accum_tex, atlas_size, atlas_slices * (p_bake_sh ? 4 : 1));
+ if (unlikely(error != BAKE_OK)) {
+ return error;
}
}