2 files changed, 12 insertions, 6 deletions
diff --git a/servers/rendering/renderer_rd/shaders/canvas.glsl b/servers/rendering/renderer_rd/shaders/canvas.glsl
index a3734a7218..f24d90a032 100644
--- a/servers/rendering/renderer_rd/shaders/canvas.glsl
+++ b/servers/rendering/renderer_rd/shaders/canvas.glsl
@@ -595,6 +595,8 @@ void main() {
 		color = vec4(0.0); //invisible by default due to using light mask
 	}
 
+	vec4 original_color = color;
+
 #ifdef MODE_LIGHT_ONLY
 	color = vec4(0.0);
 #elif !defined(MODE_UNSHADED)
@@ -636,6 +638,8 @@ void main() {
 			);
 		}
 
+		light_color.rgb *= original_color.rgb;
+
 		light_blend_compute(light_base, light_color, color.rgb);
 	}
 
@@ -732,6 +736,8 @@ void main() {
 			);
 		}
 
+		light_color.rgb *= original_color.rgb;
+
 		light_blend_compute(light_base, light_color, color.rgb);
 	}
 #endif
diff --git a/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl b/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl
index 4fc545a3fd..52aee8b648 100644
--- a/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl
+++ b/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl
@@ -462,12 +462,6 @@ void main() {
 	}
 #endif
 
-	if (params.use_debanding) {
-		// For best results, debanding should be done before tonemapping.
-		// Otherwise, we're adding noise to an already-quantized image.
-		color.rgb += screen_space_dither(gl_FragCoord.xy);
-	}
-
 	color.rgb = apply_tonemapping(color.rgb, params.white);
 
 	color.rgb = linear_to_srgb(color.rgb); // regular linear -> SRGB conversion
@@ -498,5 +492,11 @@ void main() {
 		color.rgb = apply_color_correction(color.rgb);
 	}
 
+	if (params.use_debanding) {
+		// Debanding should be done at the end of tonemapping, but before writing to the LDR buffer.
+		// Otherwise, we're adding noise to an already-quantized image.
+		color.rgb += screen_space_dither(gl_FragCoord.xy);
+	}
+
 	frag_color = color;
 }