From e85390e360d09d001ec1521823975f52bb125565 Mon Sep 17 00:00:00 2001
From: James Gayfer <10660608+jgayfer@users.noreply.github.com>
Date: Wed, 4 Dec 2024 21:37:00 -0800
Subject: [PATCH] Update to Bevy 0.15 (#39)

* Initial 0.15 support

More work needed to move things over to required components and to ensure
extraction is done correctly, but gets us to the point where bevy_light_2d
is usable with bevy 0.15.

* Migrate to required components

Required components allow us to move away from bundles (yay!) and into a
much simpler API.

I've always disliked how much of Bevy's internal components we need to
have in our bundles.

* Update README.md example for required components

* Deprecate bundles

We can get away with inserting only components now.

* Update README.md for 0.5

* Update CHANGELOG.md

* Cut first 0.5 release candidate

* Update the build

* Add bevy_window feature flag

* Add tracker links for feature flag workarounds.

* Relax Bevy requirements

* Update CHANGELOG.md
---
 CHANGELOG.md                     | 18 +++++++
 Cargo.toml                       | 14 +++--
 README.md                        | 20 ++++---
 examples/basic.rs                | 11 ++--
 examples/dungeon.rs              | 59 ++++++++++----------
 examples/multiple.rs             | 38 ++++++-------
 examples/occlusion.rs            | 93 +++++++++++++-------------------
 src/lib.rs                       |  1 +
 src/light.rs                     | 11 +++-
 src/occluder.rs                  | 11 +++-
 src/render/extract.rs            | 57 +++++++++++++-------
 src/render/light_map/pipeline.rs |  1 +
 src/render/lighting/pipeline.rs  |  3 +-
 src/render/sdf/pipeline.rs       |  1 +
 14 files changed, 185 insertions(+), 153 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff124d9..c035c8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.0] - 2024-12-04
+
+### Added
+
+- Added required component support for `PointLight2d` (#39).
+- Added required component support for `LightOccluder2d` (#39).
+
+### Changed
+
+- Updated Bevy version from `0.14` to `0.15` (#39).
+- Deprecated `PointLight2dBundle` in favour of `PointLight2d` (#39).
+- Deprecated `LightOccluder2dBundle` in favour of `LightOccluder2d` (#39).
+
+### Migration guide
+
+- Replace all uses of `PointLight2dBundle` with `PointLight2d`.
+- Replace all uses of `LightOccluder2dBundle` with `LightOccluder2d`.
+
 ## [0.4.2] - 2024-10-25
 
 ### Fixed
diff --git a/Cargo.toml b/Cargo.toml
index 80e236a..cff38b7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_light_2d"
-version = "0.4.2"
+version = "0.5.0"
 edition = "2021"
 categories = ["game-engines", "graphics", "rendering"]
 description = "General purpose 2d lighting for the Bevy game engine."
@@ -11,22 +11,28 @@ readme = "README.md"
 exclude = ["assets/*", "static/*"]
 
 [dependencies]
-bevy = { version = "0.14", default-features = false, features = [
+bevy = { version = "0.15", default-features = false, features = [
     "bevy_render",
     "bevy_core_pipeline",
     "bevy_winit",
     "x11",
+    # TODO: Remove when https://github.com/bevyengine/bevy/issues/16568 is resolved.
+    "bevy_window",
+    # TODO: Remove when https://github.com/bevyengine/bevy/issues/16563 is resolved.
+    "png"
 ] }
 smallvec = "1.13"
 
 [dev-dependencies]
-bevy = { version = "0.14", default-features = false, features = [
+bevy = { version = "0.15", default-features = false, features = [
     "bevy_render",
     "bevy_core_pipeline",
     "bevy_winit",
     "bevy_sprite",
     "png",
-    "x11"
+    "x11",
+    # TODO: Remove when https://github.com/bevyengine/bevy/issues/16568 is resolved.
+    "bevy_window"
 ] }
 
 [lints.clippy]
diff --git a/README.md b/README.md
index e885706..56a6c47 100644
--- a/README.md
+++ b/README.md
@@ -29,8 +29,8 @@ In the [`basic`](https://github.com/jgayfer/bevy_light_2d/blob/main/examples/bas
 ```toml
 # Cargo.toml
 [dependencies]
-bevy = "0.14"
-bevy_light_2d = "0.4"
+bevy = "0.15"
+bevy_light_2d = "0.5"
 ```
 
 ```rust
@@ -41,18 +41,15 @@ fn main() {
     App::new()
         .add_plugins((DefaultPlugins, Light2dPlugin))
         .add_systems(Startup, setup)
-        .run()
+        .run();
 }
 
 fn setup(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
-    
-    commands.spawn(PointLight2dBundle {
-        point_light: PointLight2d {
-            radius: 100.0,
-            intensity: 3.0,
-            ..default()
-        },
+    commands.spawn(Camera2d);
+
+    commands.spawn(PointLight2d {
+        intensity: 3.0,
+        radius: 100.0,
         ..default()
     });
 }
@@ -74,6 +71,7 @@ general application over depth of features.
 
 | bevy | bevy_light_2d |
 |------|---------------|
+| 0.15 | 0.5           |
 | 0.14 | 0.2..0.4      |
 | 0.13 | 0.1           |
 
diff --git a/examples/basic.rs b/examples/basic.rs
index 1829db6..2779883 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -9,14 +9,11 @@ fn main() {
 }
 
 fn setup(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
-    commands.spawn(PointLight2dBundle {
-        point_light: PointLight2d {
-            intensity: 3.0,
-            radius: 100.0,
-            ..default()
-        },
+    commands.spawn(PointLight2d {
+        intensity: 3.0,
+        radius: 100.0,
         ..default()
     });
 }
diff --git a/examples/dungeon.rs b/examples/dungeon.rs
index 48166da..e03b5f9 100644
--- a/examples/dungeon.rs
+++ b/examples/dungeon.rs
@@ -38,10 +38,11 @@ struct Candle;
 struct AnimationTimer(Timer);
 
 fn setup_camera(mut commands: Commands) {
-    let mut camera = Camera2dBundle::default();
-    camera.projection.scale = 0.25;
+    let mut projection = OrthographicProjection::default_2d();
+    projection.scale = 0.25;
     commands.spawn((
-        camera,
+        Camera2d,
+        projection,
         AmbientLight2d {
             brightness: 0.1,
             ..default()
@@ -55,44 +56,44 @@ fn set_clear_color(mut clear_color: ResMut<ClearColor>) {
 
 fn animate_candles(
     time: Res<Time>,
-    mut query: Query<(&mut AnimationTimer, &mut TextureAtlas), With<Candle>>,
+    mut query: Query<(&mut AnimationTimer, &mut Sprite), With<Candle>>,
 ) {
-    for (mut timer, mut atlas) in &mut query {
+    for (mut timer, mut sprite) in &mut query {
         timer.tick(time.delta());
         if timer.just_finished() {
-            atlas.index = (atlas.index + 1) % 4;
+            if let Some(ref mut texture_atlas) = sprite.texture_atlas {
+                texture_atlas.index = (texture_atlas.index + 1) % 4;
+            }
         }
     }
 }
 
 fn spawn_candles(mut commands: Commands, spritesheet: Res<CandleSpritesheet>) {
     let light = commands
-        .spawn((PointLight2dBundle {
-            transform: Transform::from_xyz(0.0, 4.0, ENTITY_INDEX),
-            point_light: PointLight2d {
+        .spawn((
+            Transform::from_xyz(0.0, 4.0, ENTITY_INDEX),
+            PointLight2d {
                 radius: 48.0,
                 color: Color::Srgba(YELLOW),
                 intensity: 2.0,
                 falloff: 4.0,
                 ..default()
             },
-            ..default()
-        },))
+        ))
         .id();
 
     commands
         .spawn((
             Candle,
             AnimationTimer(Timer::from_seconds(0.2, TimerMode::Repeating)),
-            SpriteBundle {
-                transform: Transform::from_xyz(0., 2., ENTITY_INDEX),
-                texture: spritesheet.texture.clone(),
-                ..default()
-            },
-            TextureAtlas {
-                layout: spritesheet.layout.clone(),
-                ..default()
-            },
+            Sprite::from_atlas_image(
+                spritesheet.texture.clone(),
+                TextureAtlas {
+                    layout: spritesheet.layout.clone(),
+                    index: 0,
+                },
+            ),
+            Transform::from_xyz(0., 2., ENTITY_INDEX),
         ))
         .add_child(light);
 }
@@ -166,18 +167,14 @@ fn spawn_from_atlas(
     texture: Handle<Image>,
 ) {
     commands.spawn((
-        SpriteBundle {
-            transform: Transform {
-                translation,
-                ..default()
-            },
+        Sprite::from_atlas_image(
             texture,
-            ..default()
-        },
-        TextureAtlas {
-            index: sprite_index,
-            layout: atlas_handle,
-        },
+            TextureAtlas {
+                index: sprite_index,
+                layout: atlas_handle,
+            },
+        ),
+        Transform::from_translation(translation),
     ));
 }
 
diff --git a/examples/multiple.rs b/examples/multiple.rs
index 2d6893e..2237a3c 100644
--- a/examples/multiple.rs
+++ b/examples/multiple.rs
@@ -10,53 +10,47 @@ fn main() {
 
 fn setup(mut commands: Commands) {
     commands.spawn((
-        Camera2dBundle::default(),
+        Camera2d,
         AmbientLight2d {
             brightness: 0.1,
             ..default()
         },
     ));
 
-    commands.spawn(SpriteBundle {
-        sprite: Sprite {
-            custom_size: Some(Vec2::splat(150.)),
-            color: Color::WHITE,
-            ..default()
-        },
+    commands.spawn(Sprite {
+        custom_size: Some(Vec2::splat(150.)),
+        color: Color::WHITE,
         ..default()
     });
 
-    commands.spawn(PointLight2dBundle {
-        point_light: PointLight2d {
+    commands.spawn((
+        PointLight2d {
             color: Color::Srgba(Srgba::RED),
             radius: 50.,
             intensity: 1.0,
             ..default()
         },
-        transform: Transform::from_xyz(-50., 25., 0.),
-        ..default()
-    });
+        Transform::from_xyz(-50., 25., 0.),
+    ));
 
-    commands.spawn(PointLight2dBundle {
-        point_light: PointLight2d {
+    commands.spawn((
+        PointLight2d {
             color: Color::WHITE,
             radius: 50.,
             intensity: 1.0,
             falloff: 5.0,
             ..default()
         },
-        transform: Transform::from_xyz(25., 50., 0.),
-        ..default()
-    });
+        Transform::from_xyz(25., 50., 0.),
+    ));
 
-    commands.spawn(PointLight2dBundle {
-        point_light: PointLight2d {
+    commands.spawn((
+        PointLight2d {
             color: Color::Srgba(Srgba::GREEN),
             radius: 75.,
             intensity: 1.0,
             ..default()
         },
-        transform: Transform::from_xyz(-10., -25., 0.),
-        ..default()
-    });
+        Transform::from_xyz(-10., -25., 0.),
+    ));
 }
diff --git a/examples/occlusion.rs b/examples/occlusion.rs
index e41dcf5..221b2ac 100644
--- a/examples/occlusion.rs
+++ b/examples/occlusion.rs
@@ -23,93 +23,76 @@ struct YellowLight;
 struct BlueLight;
 
 fn setup(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
 
     commands.spawn((
-        PointLight2dBundle {
-            point_light: PointLight2d {
-                intensity: 20.0,
-                radius: 1000.0,
-                falloff: 10.0,
-                cast_shadows: true,
-                color: Color::Srgba(YELLOW),
-            },
-            transform: Transform {
-                translation: Vec3::new(0.0, 200.0, 0.0),
-                ..default()
-            },
-            ..default()
+        PointLight2d {
+            intensity: 20.0,
+            radius: 1000.0,
+            falloff: 10.0,
+            cast_shadows: true,
+            color: Color::Srgba(YELLOW),
         },
+        Transform::from_translation(Vec3::new(0.0, 200.0, 0.0)),
         YellowLight,
     ));
 
     commands.spawn((
-        PointLight2dBundle {
-            point_light: PointLight2d {
-                intensity: 20.0,
-                radius: 1000.0,
-                falloff: 10.0,
-                cast_shadows: true,
-                color: Color::Srgba(BLUE),
-            },
-            transform: Transform {
-                translation: Vec3::new(0.0, -200.0, 0.0),
-                ..default()
-            },
-            ..default()
+        PointLight2d {
+            intensity: 20.0,
+            radius: 1000.0,
+            falloff: 10.0,
+            cast_shadows: true,
+            color: Color::Srgba(BLUE),
         },
+        Transform::from_translation(Vec3::new(0.0, -200.0, 0.0)),
         BlueLight,
     ));
 
-    commands.spawn(LightOccluder2dBundle {
-        light_occluder: LightOccluder2d {
+    commands.spawn((
+        LightOccluder2d {
             shape: LightOccluder2dShape::Rectangle {
                 half_size: Vec2::splat(25.0),
             },
         },
-        transform: Transform::from_xyz(-400.0, 0., 0.0),
-        ..default()
-    });
+        Transform::from_xyz(-400.0, 0., 0.0),
+    ));
 
-    commands.spawn(LightOccluder2dBundle {
-        light_occluder: LightOccluder2d {
+    commands.spawn((
+        LightOccluder2d {
             shape: LightOccluder2dShape::Rectangle {
                 half_size: Vec2::splat(25.0),
             },
         },
-        transform: Transform::from_xyz(-200.0, 0.0, 0.0),
-        ..default()
-    });
+        Transform::from_xyz(-200.0, 0.0, 0.0),
+    ));
 
-    commands.spawn(LightOccluder2dBundle {
-        light_occluder: LightOccluder2d {
+    commands.spawn((
+        LightOccluder2d {
             shape: LightOccluder2dShape::Rectangle {
                 half_size: Vec2::splat(25.0),
             },
         },
-        transform: Transform::from_xyz(0.0, 0.0, 0.0),
-        ..default()
-    });
+        Transform::from_xyz(0.0, 0.0, 0.0),
+    ));
 
-    commands.spawn(LightOccluder2dBundle {
-        light_occluder: LightOccluder2d {
+    commands.spawn((
+        LightOccluder2d {
             shape: LightOccluder2dShape::Rectangle {
                 half_size: Vec2::splat(25.0),
             },
         },
-        transform: Transform::from_xyz(200.0, 0.0, 0.0),
-        ..default()
-    });
+        Transform::from_xyz(200.0, 0.0, 0.0),
+    ));
 
-    commands.spawn(LightOccluder2dBundle {
-        light_occluder: LightOccluder2d {
+    commands.spawn((
+        LightOccluder2d {
             shape: LightOccluder2dShape::Rectangle {
                 half_size: Vec2::splat(25.0),
             },
         },
-        transform: Transform::from_xyz(400.0, 0.0, 0.0),
-        ..default()
-    });
+        Transform::from_xyz(400.0, 0.0, 0.0),
+    ));
 }
 
 fn move_lights(
@@ -118,10 +101,10 @@ fn move_lights(
     time: Res<Time>,
 ) {
     for mut light_transform in &mut yellow_query {
-        light_transform.translation.x = time.elapsed_seconds().sin() * 500.
+        light_transform.translation.x = time.elapsed_secs().sin() * 500.
     }
     for mut light_transform in &mut blue_query {
-        light_transform.translation.x = time.elapsed_seconds().cos() * 500.
+        light_transform.translation.x = time.elapsed_secs().cos() * 500.
     }
 }
 
@@ -177,7 +160,7 @@ fn control_camera_zoom(
     }
 
     for mut camera in cameras.iter_mut() {
-        camera.scale = (camera.scale - projection_delta * time.delta_seconds())
+        camera.scale = (camera.scale - projection_delta * time.delta_secs())
             .clamp(MIN_CAMERA_SCALE, MAX_CAMERA_SCALE);
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 8c66306..5a9f91e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,6 @@
 #![deny(missing_docs)]
 #![doc = include_str!("../README.md")]
+#![expect(deprecated)]
 
 pub mod light;
 pub mod occluder;
diff --git a/src/light.rs b/src/light.rs
index be764ea..2b84e34 100644
--- a/src/light.rs
+++ b/src/light.rs
@@ -1,10 +1,14 @@
 //! A module which contains lighting components.
+#![expect(deprecated)]
 
 use bevy::{
     color::Color,
     ecs::{bundle::Bundle, component::Component},
     reflect::Reflect,
-    render::view::{InheritedVisibility, ViewVisibility, Visibility},
+    render::{
+        sync_world::SyncToRenderWorld,
+        view::{InheritedVisibility, ViewVisibility, Visibility},
+    },
     transform::components::{GlobalTransform, Transform},
 };
 
@@ -21,6 +25,7 @@ use bevy::{
 /// [A better point light attenutation function](https://lisyarus.github.io/blog/posts/point-light-attenuation.html#section-the-solution)
 /// by [lisyarus](https://lisyarus.github.io/blog/).
 #[derive(Component, Clone, Reflect)]
+#[require(SyncToRenderWorld, Transform, Visibility)]
 pub struct PointLight2d {
     /// The light's color tint.
     pub color: Color,
@@ -51,6 +56,10 @@ impl Default for PointLight2d {
 
 /// A bundle of components for rendering a [`PointLight2d`] entity.
 #[derive(Bundle, Default)]
+#[deprecated(
+    since = "0.5.0",
+    note = "Use the `PointLight2d` component instead. Inserting `PointLight2d` will also insert the other components required automatically."
+)]
 pub struct PointLight2dBundle {
     /// Specifies the rendering properties of the point light, such as color and radius.
     pub point_light: PointLight2d,
diff --git a/src/occluder.rs b/src/occluder.rs
index 8a06637..90e6489 100644
--- a/src/occluder.rs
+++ b/src/occluder.rs
@@ -1,9 +1,13 @@
 //! A module which contains occluder components.
+#![expect(deprecated)]
 
 use bevy::{
     ecs::{bundle::Bundle, component::Component},
     math::Vec2,
-    render::view::{InheritedVisibility, ViewVisibility, Visibility},
+    render::{
+        sync_world::SyncToRenderWorld,
+        view::{InheritedVisibility, ViewVisibility, Visibility},
+    },
     transform::components::{GlobalTransform, Transform},
 };
 
@@ -11,6 +15,7 @@ use bevy::{
 ///
 /// This is commonly used as a component within [`LightOcluder2dBundle`].
 #[derive(Default, Component)]
+#[require(SyncToRenderWorld, Transform, Visibility)]
 pub struct LightOccluder2d {
     /// The shape of the light occluder.
     pub shape: LightOccluder2dShape,
@@ -35,6 +40,10 @@ impl Default for LightOccluder2dShape {
 
 /// A bundle of components for rendering a [`LightOccluder2d`] entity.
 #[derive(Bundle, Default)]
+#[deprecated(
+    since = "0.5.0",
+    note = "Use the `LightOccluder2d` component instead. Inserting `LightOccluder2d` will also insert the other components required automatically."
+)]
 pub struct LightOccluder2dBundle {
     /// Specifies the rendering properties of the light occluder
     pub light_occluder: LightOccluder2d,
diff --git a/src/render/extract.rs b/src/render/extract.rs
index 30deb74..308ab13 100644
--- a/src/render/extract.rs
+++ b/src/render/extract.rs
@@ -1,6 +1,6 @@
 use bevy::{
     prelude::*,
-    render::{render_resource::ShaderType, Extract},
+    render::{render_resource::ShaderType, sync_world::RenderEntity, Extract},
 };
 
 use crate::{
@@ -31,30 +31,45 @@ pub struct ExtractedAmbientLight2d {
 
 pub fn extract_point_lights(
     mut commands: Commands,
-    point_light_query: Extract<Query<(Entity, &PointLight2d, &GlobalTransform, &ViewVisibility)>>,
+    point_light_query: Extract<
+        Query<(
+            &RenderEntity,
+            &PointLight2d,
+            &GlobalTransform,
+            &ViewVisibility,
+        )>,
+    >,
 ) {
-    for (entity, point_light, global_transform, view_visibility) in &point_light_query {
+    for (render_entity, point_light, global_transform, view_visibility) in &point_light_query {
         if !view_visibility.get() {
             continue;
         }
-        commands.get_or_spawn(entity).insert(ExtractedPointLight2d {
-            color: point_light.color.to_linear(),
-            transform: global_transform.translation().xy(),
-            radius: point_light.radius,
-            intensity: point_light.intensity,
-            falloff: point_light.falloff,
-            cast_shadows: if point_light.cast_shadows { 1 } else { 0 },
-        });
+        commands
+            .entity(render_entity.id())
+            .insert(ExtractedPointLight2d {
+                color: point_light.color.to_linear(),
+                transform: global_transform.translation().xy(),
+                radius: point_light.radius,
+                intensity: point_light.intensity,
+                falloff: point_light.falloff,
+                cast_shadows: if point_light.cast_shadows { 1 } else { 0 },
+            });
     }
 }
 
 pub fn extract_light_occluders(
     mut commands: Commands,
     light_occluders_query: Extract<
-        Query<(Entity, &LightOccluder2d, &GlobalTransform, &ViewVisibility)>,
+        Query<(
+            &RenderEntity,
+            &LightOccluder2d,
+            &GlobalTransform,
+            &ViewVisibility,
+        )>,
     >,
 ) {
-    for (entity, light_occluder, global_transform, view_visibility) in &light_occluders_query {
+    for (render_entity, light_occluder, global_transform, view_visibility) in &light_occluders_query
+    {
         if !view_visibility.get() {
             continue;
         }
@@ -66,18 +81,20 @@ pub fn extract_light_occluders(
             },
         };
 
-        commands.get_or_spawn(entity).insert(extracted_occluder);
+        commands
+            .entity(render_entity.id())
+            .insert(extracted_occluder);
     }
 }
 
 pub fn extract_ambient_lights(
     mut commands: Commands,
-    ambient_light_query: Extract<Query<(Entity, &AmbientLight2d)>>,
-    camera_query: Extract<Query<Entity, (With<Camera2d>, Without<AmbientLight2d>)>>,
+    ambient_light_query: Extract<Query<(&RenderEntity, &AmbientLight2d)>>,
+    camera_query: Extract<Query<&RenderEntity, (With<Camera2d>, Without<AmbientLight2d>)>>,
 ) {
-    for (entity, ambient_light) in &ambient_light_query {
+    for (render_entity, ambient_light) in &ambient_light_query {
         commands
-            .get_or_spawn(entity)
+            .entity(render_entity.id())
             .insert(ExtractedAmbientLight2d {
                 color: ambient_light.color.to_linear() * ambient_light.brightness,
             });
@@ -85,9 +102,9 @@ pub fn extract_ambient_lights(
 
     // Our lighting pass only runs on views with an ambient light component,
     // so let's add a no-op ambient light to any 2d cameras don't have one.
-    for entity in &camera_query {
+    for render_entity in &camera_query {
         commands
-            .get_or_spawn(entity)
+            .entity(render_entity.id())
             .insert(ExtractedAmbientLight2d {
                 color: Color::WHITE.into(),
             });
diff --git a/src/render/light_map/pipeline.rs b/src/render/light_map/pipeline.rs
index 3c65b09..0f8616d 100644
--- a/src/render/light_map/pipeline.rs
+++ b/src/render/light_map/pipeline.rs
@@ -67,6 +67,7 @@ impl FromWorld for LightMapPipeline {
                     depth_stencil: None,
                     multisample: MultisampleState::default(),
                     push_constant_ranges: vec![],
+                    zero_initialize_workgroup_memory: false,
                 });
 
         Self {
diff --git a/src/render/lighting/pipeline.rs b/src/render/lighting/pipeline.rs
index 09f6e8b..a1c80c5 100644
--- a/src/render/lighting/pipeline.rs
+++ b/src/render/lighting/pipeline.rs
@@ -1,4 +1,5 @@
 use bevy::core_pipeline::fullscreen_vertex_shader::fullscreen_shader_vertex_state;
+use bevy::image::BevyDefault;
 use bevy::prelude::*;
 use bevy::render::render_resource::binding_types::{sampler, texture_2d};
 use bevy::render::render_resource::{
@@ -7,7 +8,6 @@ use bevy::render::render_resource::{
     SamplerDescriptor, ShaderStages, SpecializedRenderPipeline, TextureFormat, TextureSampleType,
 };
 use bevy::render::renderer::RenderDevice;
-use bevy::render::texture::BevyDefault;
 use bevy::render::view::ViewTarget;
 
 use super::{LightingPipelineKey, LIGHTING_SHADER};
@@ -69,6 +69,7 @@ impl SpecializedRenderPipeline for LightingPipeline {
             depth_stencil: None,
             multisample: MultisampleState::default(),
             push_constant_ranges: vec![],
+            zero_initialize_workgroup_memory: false,
         }
     }
 }
diff --git a/src/render/sdf/pipeline.rs b/src/render/sdf/pipeline.rs
index 253c340..2846850 100644
--- a/src/render/sdf/pipeline.rs
+++ b/src/render/sdf/pipeline.rs
@@ -56,6 +56,7 @@ impl FromWorld for SdfPipeline {
             depth_stencil: None,
             multisample: MultisampleState::default(),
             push_constant_ranges: vec![],
+            zero_initialize_workgroup_memory: false,
         });
 
         Self {