revert #19303

Author: atlv24

crates/bevy_render/Cargo.toml

@@ -70,9 +70,7 @@ bevy_render_macros = { path = "macros", version = "0.17.0-dev" }
 bevy_time = { path = "../bevy_time", version = "0.17.0-dev" }
 bevy_transform = { path = "../bevy_transform", version = "0.17.0-dev" }
 bevy_window = { path = "../bevy_window", version = "0.17.0-dev" }
-bevy_utils = { path = "../bevy_utils", version = "0.17.0-dev", features = [
-  "wgpu_wrapper",
-] }
+bevy_utils = { path = "../bevy_utils", version = "0.17.0-dev" }
 bevy_tasks = { path = "../bevy_tasks", version = "0.17.0-dev" }
 bevy_image = { path = "../bevy_image", version = "0.17.0-dev" }
 bevy_mesh = { path = "../bevy_mesh", version = "0.17.0-dev" }
@@ -131,6 +129,9 @@ naga_oil = { version = "0.18", default-features = false, features = [
   "test_shader",
 ] }
 
+[target.'cfg(all(target_arch = "wasm32", target_feature = "atomics"))'.dependencies]
+send_wrapper = { version = "0.6.0" }
+
 [dev-dependencies]
 proptest = "1"
 

crates/bevy_render/src/diagnostic/internal.rs

@@ -16,7 +16,7 @@ use wgpu::{
 };
 
 use crate::renderer::{RenderAdapterInfo, RenderDevice, RenderQueue};
-use bevy_utils::WgpuWrapper;
+use crate::WgpuWrapper;
 
 use super::RecordDiagnostics;
 

crates/bevy_render/src/lib.rs

@@ -49,6 +49,7 @@ pub mod sync_component;
 pub mod sync_world;
 pub mod texture;
 pub mod view;
+mod wgpu_wrapper;
 pub use bevy_camera::primitives;
 #[cfg(feature = "bevy_light")]
 mod extract_impls;
@@ -118,11 +119,11 @@ use alloc::sync::Arc;
 use bevy_app::{App, AppLabel, Plugin, SubApp};
 use bevy_asset::{AssetApp, AssetServer};
 use bevy_ecs::{prelude::*, schedule::ScheduleLabel};
-use bevy_utils::WgpuWrapper;
 use bitflags::bitflags;
 use core::ops::{Deref, DerefMut};
 use std::sync::Mutex;
 use tracing::debug;
+use wgpu_wrapper::WgpuWrapper;
 
 /// Inline shader as an `embedded_asset` and load it permanently.
 ///

crates/bevy_render/src/render_resource/bind_group.rs

@@ -1,3 +1,4 @@
+use crate::WgpuWrapper;
 use crate::{
     define_atomic_id,
     render_asset::RenderAssets,
@@ -8,7 +9,6 @@ use crate::{
 use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::system::{SystemParam, SystemParamItem};
 pub use bevy_render_macros::AsBindGroup;
-use bevy_utils::WgpuWrapper;
 use core::ops::Deref;
 use encase::ShaderType;
 use thiserror::Error;

crates/bevy_render/src/render_resource/bind_group_layout.rs

@@ -1,5 +1,5 @@
 use crate::define_atomic_id;
-use bevy_utils::WgpuWrapper;
+use crate::WgpuWrapper;
 use core::ops::Deref;
 
 define_atomic_id!(BindGroupLayoutId);

crates/bevy_render/src/render_resource/buffer.rs

@@ -1,5 +1,5 @@
 use crate::define_atomic_id;
-use bevy_utils::WgpuWrapper;
+use crate::WgpuWrapper;
 use core::ops::{Bound, Deref, RangeBounds};
 
 define_atomic_id!(BufferId);

crates/bevy_render/src/render_resource/pipeline.rs

@@ -1,12 +1,12 @@
 use super::ShaderDefVal;
 use crate::mesh::VertexBufferLayout;
+use crate::WgpuWrapper;
 use crate::{
     define_atomic_id,
     render_resource::{BindGroupLayout, Shader},
 };
 use alloc::borrow::Cow;
 use bevy_asset::Handle;
-use bevy_utils::WgpuWrapper;
 use core::ops::Deref;
 use wgpu::{
     ColorTargetState, DepthStencilState, MultisampleState, PrimitiveState, PushConstantRange,

crates/bevy_render/src/render_resource/pipeline_cache.rs

@@ -1,3 +1,4 @@
+use crate::WgpuWrapper;
 use crate::{
     render_resource::*,
     renderer::{RenderAdapter, RenderDevice},
@@ -13,7 +14,6 @@ use bevy_ecs::{
 use bevy_platform::collections::{hash_map::EntryRef, HashMap, HashSet};
 use bevy_tasks::Task;
 use bevy_utils::default;
-use bevy_utils::WgpuWrapper;
 use core::{future::Future, hash::Hash, mem};
 use naga::valid::Capabilities;
 use std::sync::{Mutex, PoisonError};

crates/bevy_render/src/render_resource/texture.rs

@@ -1,7 +1,7 @@
 use crate::define_atomic_id;
+use crate::WgpuWrapper;
 use bevy_derive::{Deref, DerefMut};
 use bevy_ecs::resource::Resource;
-use bevy_utils::WgpuWrapper;
 use core::ops::Deref;
 
 define_atomic_id!(TextureId);

crates/bevy_render/src/renderer/mod.rs

@@ -1,10 +1,10 @@
 mod graph_runner;
 mod render_device;
 
+use crate::WgpuWrapper;
 use bevy_derive::{Deref, DerefMut};
 #[cfg(not(all(target_arch = "wasm32", target_feature = "atomics")))]
 use bevy_tasks::ComputeTaskPool;
-use bevy_utils::WgpuWrapper;
 pub use graph_runner::*;
 pub use render_device::*;
 use tracing::{debug, error, info, info_span, warn};