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

Fix meshlets when bindless disabled. (#17770)

Browse Source 
# Objective

https://github.com/bevyengine/bevy/pull/16966 tried to fix a bug where
`slot` wasn't passed to `parallaxed_uv` when not running under bindless,
but failed to account for meshlets. This surfaces on macOS where
bindless is disabled.

## Solution

Lift the slot variable out of the bindless condition so it's always
available.
This commit is contained in:
charlotte 2025-02-10 01:46:10 -08:00 committed by GitHub
parent 300fe4db4d
commit 232824c009
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,17 +70,16 @@ fn pbr_input_from_standard_material(
in: VertexOutput, in: VertexOutput,
is_front: bool, is_front: bool,
) -> pbr_types::PbrInput { ) -> pbr_types::PbrInput {
#ifdef BINDLESS
#ifdef MESHLET_MESH_MATERIAL_PASS #ifdef MESHLET_MESH_MATERIAL_PASS
let slot = in.material_bind_group_slot; let slot = in.material_bind_group_slot;
#else // MESHLET_MESH_MATERIAL_PASS #else // MESHLET_MESH_MATERIAL_PASS
let slot = mesh[in.instance_index].material_and_lightmap_bind_group_slot & 0xffffu; let slot = mesh[in.instance_index].material_and_lightmap_bind_group_slot & 0xffffu;
#endif // MESHLET_MESH_MATERIAL_PASS #endif // MESHLET_MESH_MATERIAL_PASS
#ifdef BINDLESS
let flags = pbr_bindings::material[slot].flags; let flags = pbr_bindings::material[slot].flags;
let base_color = pbr_bindings::material[slot].base_color; let base_color = pbr_bindings::material[slot].base_color;
let deferred_lighting_pass_id = pbr_bindings::material[slot].deferred_lighting_pass_id; let deferred_lighting_pass_id = pbr_bindings::material[slot].deferred_lighting_pass_id;
#else // BINDLESS #else // BINDLESS
let slot = mesh[in.instance_index].material_and_lightmap_bind_group_slot & 0xffffu;
let flags = pbr_bindings::material.flags; let flags = pbr_bindings::material.flags;
let base_color = pbr_bindings::material.base_color; let base_color = pbr_bindings::material.base_color;
let deferred_lighting_pass_id = pbr_bindings::material.deferred_lighting_pass_id; let deferred_lighting_pass_id = pbr_bindings::material.deferred_lighting_pass_id;