Skip to content

remove empty_bind_group_layout #22068

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
mockersf merged 2 commits into from
Dec 9, 2025
Merged

remove empty_bind_group_layout #22068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb528c9
remove empty_bind_group_layout
ecoskey Dec 9, 2025
eb58efe
fix imports
ecoskey Dec 9, 2025
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
4 changes: 1 addition & 3 deletions crates/bevy_render/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ use crate::{
gpu_readback::GpuReadbackPlugin,
mesh::{MeshRenderAssetPlugin, RenderMesh},
render_asset::prepare_assets,
render_resource::{init_empty_bind_group_layout, PipelineCache},
render_resource::PipelineCache,
renderer::{render_system, RenderAdapterInfo},
settings::RenderCreation,
storage::StoragePlugin,
Expand Down Expand Up @@ -388,8 +388,6 @@ impl Plugin for RenderPlugin {
Render,
reset_render_asset_bytes_per_frame.in_set(RenderSystems::Cleanup),
);

render_app.add_systems(RenderStartup, init_empty_bind_group_layout);
}
}

Expand Down
20 changes: 1 addition & 19 deletions crates/bevy_render/src/render_resource/bind_group_layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
use crate::{define_atomic_id, renderer::RenderDevice, renderer::WgpuWrapper};
use bevy_ecs::system::Res;
use bevy_platform::sync::OnceLock;
use crate::{define_atomic_id, renderer::WgpuWrapper};
use core::ops::Deref;

define_atomic_id!(BindGroupLayoutId);
Expand Down Expand Up @@ -63,19 +61,3 @@ impl Deref for BindGroupLayout {
&self.value
}
}

static EMPTY_BIND_GROUP_LAYOUT: OnceLock<BindGroupLayout> = OnceLock::new();

pub(crate) fn init_empty_bind_group_layout(render_device: Res<RenderDevice>) {
let layout = render_device.create_bind_group_layout(Some("empty_bind_group_layout"), &[]);
EMPTY_BIND_GROUP_LAYOUT
.set(layout)
.expect("init_empty_bind_group_layout was called more than once");
}

pub fn empty_bind_group_layout() -> BindGroupLayout {
EMPTY_BIND_GROUP_LAYOUT
.get()
.expect("init_empty_bind_group_layout was not called")
.clone()
}