Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WebGPU: Fix crash when using sub-surface scattering #15831

Merged
merged 2 commits into from
Nov 15, 2024
Merged

WebGPU: Fix crash when using sub-surface scattering #15831

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
147f3c2
Fix crash when using sub-surface scattering
Popov72 Nov 15, 2024
691b289
Fix code
Popov72 Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions packages/dev/core/src/ShadersWGSL/ShadersInclude/pbrBlockPrePass.fx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,13 @@ var fragData: array<vec4<f32>, SCENE_MRT_COUNT>;
fragData[PREPASS_COLOR_INDEX] = vec4f(finalColor.rgb - irradiance, finalColor.a); // Split irradiance from final color
#endif
irradiance /= sqAlbedo;
fragData[PREPASS_IRRADIANCE_INDEX] = vec4f(clamp(irradiance, vec3f(0.), vec3f(1.)), writeGeometryInfo * uniforms.scatteringDiffusionProfile / 255.); // Irradiance + SS diffusion profile
#else
#ifdef PREPASS_COLOR
fragData[PREPASS_COLOR_INDEX] = finalColor; // No split lighting
#endif
var scatteringDiffusionProfile : f32 = 255.;
fragData[PREPASS_IRRADIANCE_INDEX] = vec4f(clamp(irradiance, vec3f(0.), vec3f(1.)), writeGeometryInfo); // Irradiance + SS diffusion profile
#endif

fragData[PREPASS_IRRADIANCE_INDEX] = vec4f(clamp(irradiance, vec3f(0.), vec3f(1.)), writeGeometryInfo * scatteringDiffusionProfile / 255.); // Irradiance + SS diffusion profile
#elif defined(PREPASS_COLOR)
fragData[PREPASS_COLOR_INDEX] = vec4f(finalColor.rgb, finalColor.a);
#endif
Expand Down
Loading