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

Fix occlusion culling not respecting device limits (#18974)

Browse Source 
The occlusion culling plugin checks for a GPU feature by looking at
`RenderAdapter`. This is wrong - it should be checking `RenderDevice`.
See these notes for background:
https://github.com/bevyengine/bevy/discussions/18973

I don't have any evidence that this was causing any bugs, so right now
it's just a precaution.

## Testing

```
cargo run --example occlusion_culling
```

Tested on Win10/Nvidia across Vulkan, WebGL/Chrome, WebGPU/Chrome.
This commit is contained in:
Greeble 2025-05-05 19:04:43 +01:00 committed by François Mockers
parent c64f628bfb
commit 79cbe845db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/3d/occlusion_culling.rs
View File

@ -32,7 +32,7 @@ use bevy::{
experimental::occlusion_culling::OcclusionCulling, experimental::occlusion_culling::OcclusionCulling,
render_graph::{self, NodeRunError, RenderGraphApp, RenderGraphContext, RenderLabel}, render_graph::{self, NodeRunError, RenderGraphApp, RenderGraphContext, RenderLabel},
render_resource::{Buffer, BufferDescriptor, BufferUsages, MapMode}, render_resource::{Buffer, BufferDescriptor, BufferUsages, MapMode},
renderer::{RenderAdapter, RenderContext, RenderDevice}, renderer::{RenderContext, RenderDevice},
settings::WgpuFeatures, settings::WgpuFeatures,
Render, RenderApp, RenderDebugFlags, RenderPlugin, RenderSet, Render, RenderApp, RenderDebugFlags, RenderPlugin, RenderSet,
}, },
@ -140,7 +140,7 @@ struct SavedIndirectParametersData {
impl FromWorld for SavedIndirectParameters { impl FromWorld for SavedIndirectParameters {
fn from_world(world: &mut World) -> SavedIndirectParameters { fn from_world(world: &mut World) -> SavedIndirectParameters {
let render_adapter = world.resource::<RenderAdapter>(); let render_device = world.resource::<RenderDevice>();
SavedIndirectParameters(Arc::new(Mutex::new(SavedIndirectParametersData { SavedIndirectParameters(Arc::new(Mutex::new(SavedIndirectParametersData {
data: vec![], data: vec![],
count: 0, count: 0,
@ -152,7 +152,7 @@ impl FromWorld for SavedIndirectParameters {
// supports `multi_draw_indirect_count`. So, if we don't have that // supports `multi_draw_indirect_count`. So, if we don't have that
// feature, then we don't bother to display how many meshes were // feature, then we don't bother to display how many meshes were
// culled. // culled.
occlusion_culling_introspection_supported: render_adapter occlusion_culling_introspection_supported: render_device
.features() .features()
.contains(WgpuFeatures::MULTI_DRAW_INDIRECT_COUNT), .contains(WgpuFeatures::MULTI_DRAW_INDIRECT_COUNT),
}))) })))