From 3e3a97552f9e51feccd148a6c56626598b13cfb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Fri, 21 Oct 2022 02:13:06 +0200 Subject: [PATCH] support AVAILABLE_STORAGE_BUFFER_BINDINGS >= 3 --- crates/bevy_pbr/src/render/clustered_forward.wgsl | 4 ++-- crates/bevy_pbr/src/render/mesh_view_bindings.wgsl | 2 +- crates/bevy_pbr/src/render/mesh_view_types.wgsl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/bevy_pbr/src/render/clustered_forward.wgsl b/crates/bevy_pbr/src/render/clustered_forward.wgsl index f27a10ab01e517..c291aee2ff33dc 100644 --- a/crates/bevy_pbr/src/render/clustered_forward.wgsl +++ b/crates/bevy_pbr/src/render/clustered_forward.wgsl @@ -29,7 +29,7 @@ fn fragment_cluster_index(frag_coord: vec2, view_z: f32, is_orthographic: b // this must match CLUSTER_COUNT_SIZE in light.rs let CLUSTER_COUNT_SIZE = 9u; fn unpack_offset_and_counts(cluster_index: u32) -> vec3 { -#if AVAILABLE_STORAGE_BUFFER_BINDINGS == 3 +#if AVAILABLE_STORAGE_BUFFER_BINDINGS >= 3 return cluster_offsets_and_counts.data[cluster_index].xyz; #else let offset_and_counts = cluster_offsets_and_counts.data[cluster_index >> 2u][cluster_index & ((1u << 2u) - 1u)]; @@ -44,7 +44,7 @@ fn unpack_offset_and_counts(cluster_index: u32) -> vec3 { } fn get_light_id(index: u32) -> u32 { -#if AVAILABLE_STORAGE_BUFFER_BINDINGS == 3 +#if AVAILABLE_STORAGE_BUFFER_BINDINGS >= 3 return cluster_light_index_lists.data[index]; #else // The index is correct but in cluster_light_index_lists we pack 4 u8s into a u32 diff --git a/crates/bevy_pbr/src/render/mesh_view_bindings.wgsl b/crates/bevy_pbr/src/render/mesh_view_bindings.wgsl index e1c765ee973346..cfe9ae87ef6a3a 100644 --- a/crates/bevy_pbr/src/render/mesh_view_bindings.wgsl +++ b/crates/bevy_pbr/src/render/mesh_view_bindings.wgsl @@ -25,7 +25,7 @@ var directional_shadow_textures: texture_depth_2d_array; @group(0) @binding(5) var directional_shadow_textures_sampler: sampler_comparison; -#if AVAILABLE_STORAGE_BUFFER_BINDINGS == 3 +#if AVAILABLE_STORAGE_BUFFER_BINDINGS >= 3 @group(0) @binding(6) var point_lights: PointLights; @group(0) @binding(7) diff --git a/crates/bevy_pbr/src/render/mesh_view_types.wgsl b/crates/bevy_pbr/src/render/mesh_view_types.wgsl index e0a4bbe07cd987..c9c39eb26ce85d 100644 --- a/crates/bevy_pbr/src/render/mesh_view_types.wgsl +++ b/crates/bevy_pbr/src/render/mesh_view_types.wgsl @@ -61,7 +61,7 @@ struct Lights { spot_light_shadowmap_offset: i32, }; -#if AVAILABLE_STORAGE_BUFFER_BINDINGS == 3 +#if AVAILABLE_STORAGE_BUFFER_BINDINGS >= 3 struct PointLights { data: array, };