Skip to content

Commit 68b8482

Browse files
authored
Yeet RenderAssetUsages re-export (#20498)
# Objective - Forgor to yeet this ## Solution - rember and yeet ## Testing cargo check --examples --all-features
1 parent e742730 commit 68b8482

29 files changed

+55
-63
lines changed

crates/bevy_core_pipeline/src/auto_exposure/compensation_curve.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use bevy_asset::prelude::*;
1+
use bevy_asset::{prelude::*, RenderAssetUsages};
22
use bevy_ecs::system::{lifetimeless::SRes, SystemParamItem};
33
use bevy_math::{cubic_splines::CubicGenerator, FloatExt, Vec2};
44
use bevy_reflect::prelude::*;
55
use bevy_render::{
6-
render_asset::{RenderAsset, RenderAssetUsages},
6+
render_asset::RenderAsset,
77
render_resource::{
88
Extent3d, ShaderType, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages,
99
TextureView, UniformBuffer,

crates/bevy_core_pipeline/src/post_process/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
//! Currently, this consists only of chromatic aberration.
44
55
use bevy_app::{App, Plugin};
6-
use bevy_asset::{embedded_asset, load_embedded_asset, AssetServer, Assets, Handle};
6+
use bevy_asset::{
7+
embedded_asset, load_embedded_asset, AssetServer, Assets, Handle, RenderAssetUsages,
8+
};
79
use bevy_camera::Camera;
810
use bevy_derive::{Deref, DerefMut};
911
use bevy_ecs::{
@@ -21,7 +23,7 @@ use bevy_reflect::{std_traits::ReflectDefault, Reflect};
2123
use bevy_render::{
2224
diagnostic::RecordDiagnostics,
2325
extract_component::{ExtractComponent, ExtractComponentPlugin},
24-
render_asset::{RenderAssetUsages, RenderAssets},
26+
render_asset::RenderAssets,
2527
render_graph::{
2628
NodeRunError, RenderGraphContext, RenderGraphExt as _, ViewNode, ViewNodeRunner,
2729
},

crates/bevy_core_pipeline/src/tonemapping/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
use bevy_app::prelude::*;
2-
use bevy_asset::{embedded_asset, load_embedded_asset, AssetServer, Assets, Handle};
2+
use bevy_asset::{
3+
embedded_asset, load_embedded_asset, AssetServer, Assets, Handle, RenderAssetUsages,
4+
};
35
use bevy_camera::Camera;
46
use bevy_ecs::prelude::*;
57
use bevy_image::{CompressedImageFormats, Image, ImageSampler, ImageType};
68
use bevy_reflect::{std_traits::ReflectDefault, Reflect};
79
use bevy_render::{
810
extract_component::{ExtractComponent, ExtractComponentPlugin},
911
extract_resource::{ExtractResource, ExtractResourcePlugin},
10-
render_asset::{RenderAssetUsages, RenderAssets},
12+
render_asset::RenderAssets,
1113
render_resource::{
1214
binding_types::{sampler, texture_2d, texture_3d, uniform_buffer},
1315
*,

crates/bevy_pbr/src/light_probe/generate.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//! For prefiltered environment maps, see [`bevy_light::EnvironmentMapLight`].
1313
//! These components are intended to be added to a camera.
1414
use bevy_app::{App, Plugin, Update};
15-
use bevy_asset::{embedded_asset, load_embedded_asset, AssetServer, Assets};
15+
use bevy_asset::{embedded_asset, load_embedded_asset, AssetServer, Assets, RenderAssetUsages};
1616
use bevy_core_pipeline::core_3d::graph::{Core3d, Node3d};
1717
use bevy_ecs::{
1818
component::Component,
@@ -27,7 +27,7 @@ use bevy_image::Image;
2727
use bevy_math::{Quat, UVec2, Vec2};
2828
use bevy_render::{
2929
diagnostic::RecordDiagnostics,
30-
render_asset::{RenderAssetUsages, RenderAssets},
30+
render_asset::RenderAssets,
3131
render_graph::{Node, NodeRunError, RenderGraphContext, RenderGraphExt, RenderLabel},
3232
render_resource::{
3333
binding_types::*, AddressMode, BindGroup, BindGroupEntries, BindGroupLayout,

crates/bevy_render/src/render_asset.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ use crate::{
33
RenderSystems, Res,
44
};
55
use bevy_app::{App, Plugin, SubApp};
6-
pub use bevy_asset::RenderAssetUsages;
7-
use bevy_asset::{Asset, AssetEvent, AssetId, Assets};
6+
use bevy_asset::{Asset, AssetEvent, AssetId, Assets, RenderAssetUsages};
87
use bevy_ecs::{
98
prelude::{Commands, EventReader, IntoScheduleConfigs, ResMut, Resource},
109
schedule::{ScheduleConfigs, SystemSet},

crates/bevy_render/src/storage.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use crate::{
2-
render_asset::{PrepareAssetError, RenderAsset, RenderAssetPlugin, RenderAssetUsages},
2+
render_asset::{PrepareAssetError, RenderAsset, RenderAssetPlugin},
33
render_resource::{Buffer, BufferUsages},
44
renderer::RenderDevice,
55
};
66
use bevy_app::{App, Plugin};
7-
use bevy_asset::{Asset, AssetApp, AssetId};
7+
use bevy_asset::{Asset, AssetApp, AssetId, RenderAssetUsages};
88
use bevy_ecs::system::{lifetimeless::SRes, SystemParamItem};
99
use bevy_reflect::{prelude::ReflectDefault, Reflect};
1010
use bevy_utils::default;

crates/bevy_render/src/texture/fallback_image.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::{
2-
render_asset::RenderAssetUsages,
32
render_resource::*,
43
renderer::{RenderDevice, RenderQueue},
54
texture::{DefaultImageSampler, GpuImage},
65
};
6+
use bevy_asset::RenderAssetUsages;
77
use bevy_derive::{Deref, DerefMut};
88
use bevy_ecs::{
99
prelude::{FromWorld, Res, ResMut},

crates/bevy_render/src/texture/gpu_image.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::{
2-
render_asset::{PrepareAssetError, RenderAsset, RenderAssetUsages},
2+
render_asset::{PrepareAssetError, RenderAsset},
33
render_resource::{DefaultImageSampler, Sampler, Texture, TextureView},
44
renderer::{RenderDevice, RenderQueue},
55
};
6-
use bevy_asset::AssetId;
6+
use bevy_asset::{AssetId, RenderAssetUsages};
77
use bevy_ecs::system::{lifetimeless::SRes, SystemParamItem};
88
use bevy_image::{Image, ImageSampler};
99
use bevy_math::{AspectRatio, UVec2};

crates/bevy_render/src/view/window/screenshot.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::ExtractedWindows;
22
use crate::{
33
gpu_readback,
4-
render_asset::{RenderAssetUsages, RenderAssets},
4+
render_asset::RenderAssets,
55
render_resource::{
66
binding_types::texture_2d, BindGroup, BindGroupEntries, BindGroupLayout,
77
BindGroupLayoutEntries, Buffer, BufferUsages, CachedRenderPipelineId, FragmentState,
@@ -15,7 +15,7 @@ use crate::{
1515
};
1616
use alloc::{borrow::Cow, sync::Arc};
1717
use bevy_app::{First, Plugin, Update};
18-
use bevy_asset::{embedded_asset, load_embedded_asset, AssetServer, Handle};
18+
use bevy_asset::{embedded_asset, load_embedded_asset, AssetServer, Handle, RenderAssetUsages};
1919
use bevy_camera::{ManualTextureViewHandle, NormalizedRenderTarget, RenderTarget};
2020
use bevy_derive::{Deref, DerefMut};
2121
use bevy_ecs::{

crates/bevy_text/src/font_atlas.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
use bevy_asset::{Assets, Handle};
1+
use bevy_asset::{Assets, Handle, RenderAssetUsages};
22
use bevy_image::{prelude::*, ImageSampler, ToExtents};
33
use bevy_math::{IVec2, UVec2};
44
use bevy_platform::collections::HashMap;
5-
use bevy_render::{
6-
render_asset::RenderAssetUsages,
7-
render_resource::{TextureDimension, TextureFormat},
8-
};
5+
use bevy_render::render_resource::{TextureDimension, TextureFormat};
96

107
use crate::{FontSmoothing, GlyphAtlasLocation, TextError};
118

0 commit comments

Comments
 (0)