forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SSAO specular occlusion roughness bug (#20067)

Browse Source 
Noticed that we're converting perceptual_roughness to roughness for SSAO
specular occlusion up here, _but_ that happens _before_ we sample the
metallic_roughness texture map. So we're using the wrong roughness. I
assume this is a bug and was not intentional.

Suggest reviewing while hiding the whitespace diff.
This commit is contained in:
JMS55 2025-07-10 22:01:15 -07:00 committed by GitHub
parent f8680135ed
commit 83305afa66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/bevy_pbr/src/render/pbr_fragment.wgsl
View File

@ -377,7 +377,6 @@ fn pbr_input_from_standard_material(
var perceptual_roughness: f32 = pbr_bindings::material.perceptual_roughness; var perceptual_roughness: f32 = pbr_bindings::material.perceptual_roughness;
#endif // BINDLESS #endif // BINDLESS
let roughness = lighting::perceptualRoughnessToRoughness(perceptual_roughness);
#ifdef VERTEX_UVS #ifdef VERTEX_UVS
if ((flags & pbr_types::STANDARD_MATERIAL_FLAGS_METALLIC_ROUGHNESS_TEXTURE_BIT) != 0u) { if ((flags & pbr_types::STANDARD_MATERIAL_FLAGS_METALLIC_ROUGHNESS_TEXTURE_BIT) != 0u) {
let metallic_roughness = let metallic_roughness =
@ -627,7 +626,7 @@ fn pbr_input_from_standard_material(
var specular_occlusion: f32 = 1.0; var specular_occlusion: f32 = 1.0;
#ifdef VERTEX_UVS #ifdef VERTEX_UVS
if ((flags & pbr_types::STANDARD_MATERIAL_FLAGS_OCCLUSION_TEXTURE_BIT) != 0u) { if ((flags & pbr_types::STANDARD_MATERIAL_FLAGS_OCCLUSION_TEXTURE_BIT) != 0u) {
diffuse_occlusion *= diffuse_occlusion *=
#ifdef MESHLET_MESH_MATERIAL_PASS #ifdef MESHLET_MESH_MATERIAL_PASS
textureSampleGrad( textureSampleGrad(
#else // MESHLET_MESH_MATERIAL_PASS #else // MESHLET_MESH_MATERIAL_PASS
@ -660,7 +659,8 @@ fn pbr_input_from_standard_material(
diffuse_occlusion = min(diffuse_occlusion, ssao_multibounce); diffuse_occlusion = min(diffuse_occlusion, ssao_multibounce);
// Use SSAO to estimate the specular occlusion. // Use SSAO to estimate the specular occlusion.
// Lagarde and Rousiers 2014, "Moving Frostbite to Physically Based Rendering" // Lagarde and Rousiers 2014, "Moving Frostbite to Physically Based Rendering"
specular_occlusion = saturate(pow(NdotV + ssao, exp2(-16.0 * roughness - 1.0)) - 1.0 + ssao); let roughness = lighting::perceptualRoughnessToRoughness(pbr_input.material.perceptual_roughness);
specular_occlusion = saturate(pow(NdotV + ssao, exp2(-16.0 * roughness - 1.0)) - 1.0 + ssao);
#endif #endif
pbr_input.diffuse_occlusion = diffuse_occlusion; pbr_input.diffuse_occlusion = diffuse_occlusion;
pbr_input.specular_occlusion = specular_occlusion; pbr_input.specular_occlusion = specular_occlusion;