Skip to content

Make the prepass shader compile when lightmaps are present. #13402

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

Merged
alice-i-cecile merged 5 commits into from
May 18, 2024
Merged

Make the prepass shader compile when lightmaps are present. #13402

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2e8dbb
Make the prepass shader compile when lightmaps are present.
pcwalton May 16, 2024
237890d
Address review comment
pcwalton May 17, 2024
ff46c20
Merge remote-tracking branch 'origin/main' into prepass-lightmaps-fix
pcwalton May 17, 2024
3190f9c
Merge remote-tracking branch 'origin/main' into prepass-lightmaps-fix
pcwalton May 18, 2024
a1a3709
Fix syntax
pcwalton May 18, 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
14 changes: 5 additions & 9 deletions crates/bevy_pbr/src/render/pbr_prepass_functions.wgsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,12 @@ fn prepass_alpha_discard(in: VertexOutput) {
var output_color: vec4<f32> = pbr_bindings::material.base_color;

#ifdef VERTEX_UVS
#ifdef VERTEX_UVS_A
var uv = in.uv;
#else
#ifdef STANDARD_MATERIAL_BASE_COLOR_UV_B
var uv = in.uv_b;
#endif
#ifdef VERTEX_UVS_B
if ((pbr_bindings::material.flags & pbr_types::STANDARD_MATERIAL_FLAGS_BASE_COLOR_UV_BIT) != 0u) {
uv = in.uv_b;
}
#endif
#else // STANDARD_MATERIAL_BASE_COLOR_UV_B
var uv = in.uv;
#endif // STANDARD_MATERIAL_BASE_COLOR_UV_B

let uv_transform = pbr_bindings::material.uv_transform;
uv = (uv_transform * vec3(uv, 1.0)).xy;
if (pbr_bindings::material.flags & pbr_types::STANDARD_MATERIAL_FLAGS_BASE_COLOR_TEXTURE_BIT) != 0u {
Expand Down