From 62c9d26d8609320b9f03a736ba02da5beb03b958 Mon Sep 17 00:00:00 2001 From: Zane Date: Wed, 8 Mar 2023 11:10:10 -0600 Subject: [PATCH 1/3] Only care about deband dithering if also tonemapping --- crates/bevy_pbr/src/render/pbr.wgsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_pbr/src/render/pbr.wgsl b/crates/bevy_pbr/src/render/pbr.wgsl index b87208edca6b3..af23c901bd7a9 100644 --- a/crates/bevy_pbr/src/render/pbr.wgsl +++ b/crates/bevy_pbr/src/render/pbr.wgsl @@ -106,7 +106,6 @@ fn fragment(in: FragmentInput) -> @location(0) vec4 { #ifdef TONEMAP_IN_SHADER output_color = tone_mapping(output_color); -#endif #ifdef DEBAND_DITHER var output_rgb = output_color.rgb; output_rgb = powsafe(output_rgb, 1.0 / 2.2); @@ -116,6 +115,7 @@ fn fragment(in: FragmentInput) -> @location(0) vec4 { output_rgb = powsafe(output_rgb, 2.2); output_color = vec4(output_rgb, output_color.a); #endif +#endif #ifdef PREMULTIPLY_ALPHA output_color = premultiply_alpha(material.flags, output_color); #endif From 5d8c7d2e383628e5caf875336d474ae043e5d27e Mon Sep 17 00:00:00 2001 From: Zane Date: Wed, 8 Mar 2023 11:20:42 -0600 Subject: [PATCH 2/3] Remove dither function, made obsolete in c069c54 --- crates/bevy_pbr/src/render/pbr_functions.wgsl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/crates/bevy_pbr/src/render/pbr_functions.wgsl b/crates/bevy_pbr/src/render/pbr_functions.wgsl index 45f42268c0e64..8ded96cfaefed 100644 --- a/crates/bevy_pbr/src/render/pbr_functions.wgsl +++ b/crates/bevy_pbr/src/render/pbr_functions.wgsl @@ -270,12 +270,6 @@ fn pbr( } #endif // NORMAL_PREPASS -#ifdef DEBAND_DITHER -fn dither(color: vec4, pos: vec2) -> vec4 { - return vec4(color.rgb + screen_space_dither(pos.xy), color.a); -} -#endif // DEBAND_DITHER - #ifndef NORMAL_PREPASS fn apply_fog(input_color: vec4, fragment_world_position: vec3, view_world_position: vec3) -> vec4 { let view_to_world = fragment_world_position.xyz - view_world_position.xyz; From dbaa8e0062d2e474a5d34f6387bc4a960587a468 Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Mon, 27 Mar 2023 14:11:07 -0700 Subject: [PATCH 3/3] Fix indent --- crates/bevy_pbr/src/render/pbr.wgsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/bevy_pbr/src/render/pbr.wgsl b/crates/bevy_pbr/src/render/pbr.wgsl index af23c901bd7a9..d9f621977e927 100644 --- a/crates/bevy_pbr/src/render/pbr.wgsl +++ b/crates/bevy_pbr/src/render/pbr.wgsl @@ -105,7 +105,7 @@ fn fragment(in: FragmentInput) -> @location(0) vec4 { } #ifdef TONEMAP_IN_SHADER - output_color = tone_mapping(output_color); + output_color = tone_mapping(output_color); #ifdef DEBAND_DITHER var output_rgb = output_color.rgb; output_rgb = powsafe(output_rgb, 1.0 / 2.2); @@ -117,7 +117,7 @@ fn fragment(in: FragmentInput) -> @location(0) vec4 { #endif #endif #ifdef PREMULTIPLY_ALPHA - output_color = premultiply_alpha(material.flags, output_color); + output_color = premultiply_alpha(material.flags, output_color); #endif return output_color; }