Skip to content

Commit 6b23784

Browse files
committed
init_gpu_resource
1 parent d96559a commit 6b23784

File tree

54 files changed

+188
-163
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+188
-163
lines changed

crates/bevy_anti_alias/src/fxaa/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use bevy_render::{
1717
},
1818
renderer::RenderDevice,
1919
view::{ExtractedView, ViewTarget},
20-
Render, RenderApp, RenderStartup, RenderSystems,
20+
GpuResourceAppExt, Render, RenderApp, RenderStartup, RenderSystems,
2121
};
2222
use bevy_shader::Shader;
2323
use bevy_utils::default;
@@ -93,7 +93,7 @@ impl Plugin for FxaaPlugin {
9393
return;
9494
};
9595
render_app
96-
.init_resource::<SpecializedRenderPipelines<FxaaPipeline>>()
96+
.init_gpu_resource::<SpecializedRenderPipelines<FxaaPipeline>>()
9797
.add_systems(RenderStartup, init_fxaa_pipeline)
9898
.add_systems(
9999
Render,

crates/bevy_anti_alias/src/smaa/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ use bevy_render::{
7272
renderer::{RenderContext, RenderDevice, RenderQueue, ViewQuery},
7373
texture::{CachedTexture, GpuImage, TextureCache},
7474
view::{ExtractedView, ViewTarget},
75-
Render, RenderApp, RenderStartup, RenderSystems,
75+
GpuResourceAppExt, Render, RenderApp, RenderStartup, RenderSystems,
7676
};
7777
use bevy_shader::{Shader, ShaderDefVal};
7878
use bevy_utils::prelude::default;
@@ -345,7 +345,7 @@ impl Plugin for SmaaPlugin {
345345
render_app
346346
.insert_resource(smaa_luts)
347347
.init_resource::<SmaaSpecializedRenderPipelines>()
348-
.init_resource::<SmaaInfoUniformBuffer>()
348+
.init_gpu_resource::<SmaaInfoUniformBuffer>()
349349
.add_systems(RenderStartup, init_smaa_pipelines)
350350
.add_systems(
351351
Render,

crates/bevy_core_pipeline/src/blit/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use bevy_render::{
88
*,
99
},
1010
renderer::RenderDevice,
11-
RenderApp, RenderStartup,
11+
GpuResourceAppExt, RenderApp, RenderStartup,
1212
};
1313
use bevy_shader::Shader;
1414
use bevy_utils::default;
@@ -26,7 +26,7 @@ impl Plugin for BlitPlugin {
2626

2727
render_app
2828
.allow_ambiguous_resource::<SpecializedRenderPipelines<BlitPipeline>>()
29-
.init_resource::<SpecializedRenderPipelines<BlitPipeline>>()
29+
.init_gpu_resource::<SpecializedRenderPipelines<BlitPipeline>>()
3030
.add_systems(RenderStartup, init_blit_pipeline);
3131
}
3232
}

crates/bevy_core_pipeline/src/mip_generation/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ use bevy_render::{
5151
texture::GpuImage,
5252
RenderStartup,
5353
};
54-
use bevy_render::{Render, RenderApp, RenderSystems};
54+
use bevy_render::{GpuResourceAppExt, Render, RenderApp, RenderSystems};
5555
use bevy_shader::{Shader, ShaderDefVal};
5656
use bevy_utils::default;
5757

@@ -288,7 +288,7 @@ impl Plugin for MipGenerationPlugin {
288288
};
289289

290290
render_app
291-
.init_resource::<SpecializedComputePipelines<DownsampleDepthPipeline>>()
291+
.init_gpu_resource::<SpecializedComputePipelines<DownsampleDepthPipeline>>()
292292
.init_resource::<MipGenerationJobs>()
293293
.init_resource::<MipGenerationPipelines>()
294294
.insert_resource(downsample_shaders)
@@ -334,7 +334,7 @@ impl Plugin for MipGenerationPlugin {
334334

335335
// This needs to be done here so that we have access to the
336336
// `RenderDevice`.
337-
render_app.init_resource::<MipGenerationResources>();
337+
render_app.init_gpu_resource::<MipGenerationResources>();
338338
}
339339
}
340340

crates/bevy_core_pipeline/src/prepass/background_motion_vectors.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use bevy_render::{
3030
renderer::RenderDevice,
3131
sync_component::SyncComponent,
3232
view::{Msaa, ViewUniform, ViewUniforms},
33-
Render, RenderApp, RenderStartup, RenderSystems,
33+
GpuResourceAppExt, Render, RenderApp, RenderStartup, RenderSystems,
3434
};
3535
use bevy_shader::Shader;
3636
use bevy_utils::prelude::default;
@@ -94,8 +94,8 @@ impl Plugin for BackgroundMotionVectorsPlugin {
9494
return;
9595
};
9696
render_app
97-
.init_resource::<SpecializedRenderPipelines<BackgroundMotionVectorsPipeline>>()
98-
.init_resource::<PreviousViewUniforms>()
97+
.init_gpu_resource::<SpecializedRenderPipelines<BackgroundMotionVectorsPipeline>>()
98+
.init_gpu_resource::<PreviousViewUniforms>()
9999
.add_systems(RenderStartup, init_background_motion_vectors_pipeline)
100100
.add_systems(
101101
Render,

crates/bevy_core_pipeline/src/skybox/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use bevy_render::{
2222
sync_world::RenderEntity,
2323
texture::GpuImage,
2424
view::{ExtractedView, Msaa, ViewTarget, ViewUniform, ViewUniforms},
25-
Extract, ExtractSchedule, Render, RenderApp, RenderStartup, RenderSystems,
25+
Extract, ExtractSchedule, GpuResourceAppExt, Render, RenderApp, RenderStartup, RenderSystems,
2626
};
2727
use bevy_shader::Shader;
2828
use bevy_transform::components::Transform;
@@ -42,7 +42,7 @@ impl Plugin for SkyboxPlugin {
4242
return;
4343
};
4444
render_app
45-
.init_resource::<SpecializedRenderPipelines<SkyboxPipeline>>()
45+
.init_gpu_resource::<SpecializedRenderPipelines<SkyboxPipeline>>()
4646
.add_systems(ExtractSchedule, extract_skybox)
4747
.add_systems(RenderStartup, init_skybox_pipeline)
4848
.add_systems(

crates/bevy_core_pipeline/src/tonemapping/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use bevy_render::{
1919
renderer::RenderDevice,
2020
texture::{FallbackImage, GpuImage},
2121
view::{ExtractedView, ViewTarget, ViewUniform},
22-
Render, RenderApp, RenderStartup, RenderSystems,
22+
GpuResourceAppExt, Render, RenderApp, RenderStartup, RenderSystems,
2323
};
2424
use bevy_shader::{load_shader_library, Shader, ShaderDefVal};
2525
use bitflags::bitflags;
@@ -93,7 +93,7 @@ impl Plugin for TonemappingPlugin {
9393
return;
9494
};
9595
render_app
96-
.init_resource::<SpecializedRenderPipelines<TonemappingPipeline>>()
96+
.init_gpu_resource::<SpecializedRenderPipelines<TonemappingPipeline>>()
9797
.add_systems(RenderStartup, init_tonemapping_pipeline)
9898
.add_systems(
9999
Render,

crates/bevy_dev_tools/src/render_debug.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use bevy_render::{
3737
renderer::{RenderContext, RenderDevice, RenderQueue, ViewQuery},
3838
texture::{FallbackImage, GpuImage},
3939
view::{Msaa, ViewTarget, ViewUniformOffset},
40-
Render, RenderApp, RenderStartup, RenderSystems,
40+
GpuResourceAppExt, Render, RenderApp, RenderStartup, RenderSystems,
4141
};
4242
use bevy_shader::Shader;
4343

@@ -82,8 +82,8 @@ impl Plugin for RenderDebugOverlayPlugin {
8282
};
8383

8484
render_app
85-
.init_resource::<SpecializedRenderPipelines<RenderDebugOverlayPipeline>>()
86-
.init_resource::<RenderDebugOverlayUniforms>()
85+
.init_gpu_resource::<SpecializedRenderPipelines<RenderDebugOverlayPipeline>>()
86+
.init_gpu_resource::<RenderDebugOverlayUniforms>()
8787
.add_systems(
8888
Render,
8989
(

crates/bevy_gizmos_render/src/pipeline_2d.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ use bevy_ecs::{
1717
};
1818
use bevy_image::BevyDefault as _;
1919
use bevy_math::FloatOrd;
20-
use bevy_render::RenderStartup;
2120
use bevy_render::{
2221
render_asset::{prepare_assets, RenderAssets},
2322
render_phase::{
@@ -28,6 +27,7 @@ use bevy_render::{
2827
view::{ExtractedView, Msaa, ViewTarget},
2928
Render, RenderApp, RenderSystems,
3029
};
30+
use bevy_render::{GpuResourceAppExt, RenderStartup};
3131
use bevy_shader::Shader;
3232
use bevy_sprite_render::{
3333
init_mesh_2d_pipeline, Mesh2dPipeline, Mesh2dPipelineKey, SetMesh2dViewBindGroup,
@@ -47,8 +47,8 @@ impl Plugin for LineGizmo2dPlugin {
4747
.add_render_command::<Transparent2d, DrawLineGizmo2d>()
4848
.add_render_command::<Transparent2d, DrawLineGizmo2dStrip>()
4949
.add_render_command::<Transparent2d, DrawLineJointGizmo2d>()
50-
.init_resource::<SpecializedRenderPipelines<LineGizmoPipeline>>()
51-
.init_resource::<SpecializedRenderPipelines<LineJointGizmoPipeline>>()
50+
.init_gpu_resource::<SpecializedRenderPipelines<LineGizmoPipeline>>()
51+
.init_gpu_resource::<SpecializedRenderPipelines<LineJointGizmoPipeline>>()
5252
.configure_sets(
5353
Render,
5454
GizmoRenderSystems::QueueLineGizmos2d

crates/bevy_gizmos_render/src/pipeline_3d.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use bevy_render::{
3030
view::{ExtractedView, ViewTarget},
3131
Render, RenderApp, RenderSystems,
3232
};
33-
use bevy_render::{sync_world::MainEntity, RenderStartup};
33+
use bevy_render::{sync_world::MainEntity, GpuResourceAppExt, RenderStartup};
3434
use bevy_shader::Shader;
3535
use bevy_utils::default;
3636
use tracing::error;
@@ -46,7 +46,7 @@ impl Plugin for LineGizmo3dPlugin {
4646
.add_render_command::<Transparent3d, DrawLineGizmo3d>()
4747
.add_render_command::<Transparent3d, DrawLineGizmo3dStrip>()
4848
.add_render_command::<Transparent3d, DrawLineJointGizmo3d>()
49-
.init_resource::<SpecializedRenderPipelines<LineJointGizmoPipeline>>()
49+
.init_gpu_resource::<SpecializedRenderPipelines<LineJointGizmoPipeline>>()
5050
.configure_sets(
5151
Render,
5252
GizmoRenderSystems::QueueLineGizmos3d.in_set(RenderSystems::Queue),

0 commit comments

Comments
 (0)