Skip to content

Commit 5b930c8

Browse files
committed
Fix feature gating in texture_binding_array example (#7425)
# Objective Fixes #7374 ## Solution Move the feature gate into `main`, before `MaterialPlugin::<BindlessMaterial>` is added, as described in #7374 (comment)
1 parent 8f81be9 commit 5b930c8

File tree

1 file changed

+19
-17
lines changed

1 file changed

+19
-17
lines changed

examples/shader/texture_binding_array.rs

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,11 @@ use bevy::{
1414
use std::num::NonZeroU32;
1515

1616
fn main() {
17-
App::new()
18-
.add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
19-
.add_plugin(MaterialPlugin::<BindlessMaterial>::default())
20-
.add_startup_system(setup)
21-
.run();
22-
}
17+
let mut app = App::new();
18+
app.add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()));
2319

24-
const MAX_TEXTURE_COUNT: usize = 16;
25-
const TILE_ID: [usize; 16] = [
26-
19, 23, 4, 33, 12, 69, 30, 48, 10, 65, 40, 47, 57, 41, 44, 46,
27-
];
20+
let render_device = app.world.resource::<RenderDevice>();
2821

29-
fn setup(
30-
mut commands: Commands,
31-
mut meshes: ResMut<Assets<Mesh>>,
32-
mut materials: ResMut<Assets<BindlessMaterial>>,
33-
asset_server: Res<AssetServer>,
34-
render_device: Res<RenderDevice>,
35-
) {
3622
// check if the device support the required feature
3723
if !render_device
3824
.features()
@@ -46,6 +32,22 @@ fn setup(
4632
return;
4733
}
4834

35+
app.add_plugin(MaterialPlugin::<BindlessMaterial>::default())
36+
.add_startup_system(setup)
37+
.run();
38+
}
39+
40+
const MAX_TEXTURE_COUNT: usize = 16;
41+
const TILE_ID: [usize; 16] = [
42+
19, 23, 4, 33, 12, 69, 30, 48, 10, 65, 40, 47, 57, 41, 44, 46,
43+
];
44+
45+
fn setup(
46+
mut commands: Commands,
47+
mut meshes: ResMut<Assets<Mesh>>,
48+
mut materials: ResMut<Assets<BindlessMaterial>>,
49+
asset_server: Res<AssetServer>,
50+
) {
4951
commands.spawn(Camera3dBundle {
5052
transform: Transform::from_xyz(2.0, 2.0, 2.0).looking_at(Vec3::new(0.0, 0.0, 0.0), Vec3::Y),
5153
..Default::default()

0 commit comments

Comments
 (0)