Skip to content

Commit 1faa836

Browse files
kurtkuehnertkurtkuehnert
committed
renamed GPU* to Gpu*
1 parent 35b84a8 commit 1faa836

Some content is hidden

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

51 files changed

+189
-189
lines changed

‎crates/bevy_core_pipeline/src/bloom/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use bevy_render::{
1919
render_graph::{Node, NodeRunError, RenderGraph, RenderGraphContext, SlotInfo, SlotType},
2020
render_phase::TrackedRenderPass,
2121
render_resource::*,
22-
renderer::{GPUContext, GPUDevice},
22+
renderer::{GpuContext, GpuDevice},
2323
texture::{CachedTexture, TextureCache},
2424
view::ViewTarget,
2525
RenderApp, RenderStage,
@@ -200,7 +200,7 @@ impl Node for BloomNode {
200200
fn run(
201201
&self,
202202
graph: &mut RenderGraphContext,
203-
gpu_context: &mut GPUContext,
203+
gpu_context: &mut GpuContext,
204204
world: &World,
205205
) -> Result<(), NodeRunError> {
206206
#[cfg(feature = "trace")]
@@ -350,7 +350,7 @@ struct BloomPipelines {
350350

351351
impl FromWorld for BloomPipelines {
352352
fn from_world(world: &mut World) -> Self {
353-
let gpu_device = world.resource::<GPUDevice>();
353+
let gpu_device = world.resource::<GpuDevice>();
354354

355355
let sampler = gpu_device.create_sampler(&SamplerDescriptor {
356356
min_filter: FilterMode::Linear,
@@ -563,7 +563,7 @@ impl BloomTextures {
563563
fn prepare_bloom_textures(
564564
mut commands: Commands,
565565
mut texture_cache: ResMut<TextureCache>,
566-
gpu_device: Res<GPUDevice>,
566+
gpu_device: Res<GpuDevice>,
567567
views: Query<(Entity, &ExtractedCamera), With<BloomUniform>>,
568568
) {
569569
let mut texture_as = HashMap::default();
@@ -633,7 +633,7 @@ struct BloomBindGroups {
633633

634634
fn queue_bloom_bind_groups(
635635
mut commands: Commands,
636-
gpu_device: Res<GPUDevice>,
636+
gpu_device: Res<GpuDevice>,
637637
pipelines: Res<BloomPipelines>,
638638
uniforms: Res<ComponentUniforms<BloomUniform>>,
639639
views: Query<(Entity, &ViewTarget, &BloomTextures)>,

‎crates/bevy_core_pipeline/src/core_2d/main_pass_2d_node.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use bevy_render::{
88
render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
99
render_phase::{DrawFunctions, RenderPhase, TrackedRenderPass},
1010
render_resource::{LoadOp, Operations, RenderPassDescriptor},
11-
renderer::GPUContext,
11+
renderer::GpuContext,
1212
view::{ExtractedView, ViewTarget},
1313
};
1414
#[cfg(feature = "trace")]
@@ -48,7 +48,7 @@ impl Node for MainPass2dNode {
4848
fn run(
4949
&self,
5050
graph: &mut RenderGraphContext,
51-
gpu_context: &mut GPUContext,
51+
gpu_context: &mut GpuContext,
5252
world: &World,
5353
) -> Result<(), NodeRunError> {
5454
let view_entity = graph.get_input_entity(Self::IN_VIEW)?;

‎crates/bevy_core_pipeline/src/core_3d/main_pass_3d_node.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use bevy_render::{
88
render_graph::{Node, NodeRunError, RenderGraphContext, SlotInfo, SlotType},
99
render_phase::{DrawFunctions, RenderPhase, TrackedRenderPass},
1010
render_resource::{LoadOp, Operations, RenderPassDepthStencilAttachment, RenderPassDescriptor},
11-
renderer::GPUContext,
11+
renderer::GpuContext,
1212
view::{ExtractedView, ViewDepthTexture, ViewTarget},
1313
};
1414
#[cfg(feature = "trace")]
@@ -51,7 +51,7 @@ impl Node for MainPass3dNode {
5151
fn run(
5252
&self,
5353
graph: &mut RenderGraphContext,
54-
gpu_context: &mut GPUContext,
54+
gpu_context: &mut GpuContext,
5555
world: &World,
5656
) -> Result<(), NodeRunError> {
5757
let view_entity = graph.get_input_entity(Self::IN_VIEW)?;

‎crates/bevy_core_pipeline/src/core_3d/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use bevy_render::{
3636
CachedRenderPipelineId, Extent3d, TextureDescriptor, TextureDimension, TextureFormat,
3737
TextureUsages,
3838
},
39-
renderer::GPUDevice,
39+
renderer::GpuDevice,
4040
texture::TextureCache,
4141
view::ViewDepthTexture,
4242
Extract, RenderApp, RenderStage,
@@ -257,7 +257,7 @@ pub fn prepare_core_3d_depth_textures(
257257
mut commands: Commands,
258258
mut texture_cache: ResMut<TextureCache>,
259259
msaa: Res<Msaa>,
260-
gpu_device: Res<GPUDevice>,
260+
gpu_device: Res<GpuDevice>,
261261
views_3d: Query<
262262
(Entity, &ExtractedCamera),
263263
(

‎crates/bevy_core_pipeline/src/fxaa/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use bevy_render::{
99
prelude::Camera,
1010
render_graph::RenderGraph,
1111
render_resource::*,
12-
renderer::GPUDevice,
12+
renderer::GpuDevice,
1313
texture::BevyDefault,
1414
view::{ExtractedView, ViewTarget},
1515
RenderApp, RenderStage,
@@ -153,7 +153,7 @@ pub struct FxaaPipeline {
153153
impl FromWorld for FxaaPipeline {
154154
fn from_world(render_world: &mut World) -> Self {
155155
let texture_bind_group = render_world
156-
.resource::<GPUDevice>()
156+
.resource::<GpuDevice>()
157157
.create_bind_group_layout(&BindGroupLayoutDescriptor {
158158
label: Some("fxaa_texture_bind_group_layout"),
159159
entries: &[

‎crates/bevy_core_pipeline/src/fxaa/node.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use bevy_render::{
1010
PipelineCache, RenderPassColorAttachment, RenderPassDescriptor, SamplerDescriptor,
1111
TextureViewId,
1212
},
13-
renderer::GPUContext,
13+
renderer::GpuContext,
1414
view::{ExtractedView, ViewTarget},
1515
};
1616
use bevy_utils::default;
@@ -50,7 +50,7 @@ impl Node for FxaaNode {
5050
fn run(
5151
&self,
5252
graph: &mut RenderGraphContext,
53-
gpu_context: &mut GPUContext,
53+
gpu_context: &mut GpuContext,
5454
world: &World,
5555
) -> Result<(), NodeRunError> {
5656
let view_entity = graph.get_input_entity(Self::IN_VIEW)?;

‎crates/bevy_core_pipeline/src/tonemapping/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use bevy_ecs::query::QueryItem;
66
use bevy_reflect::{Reflect, TypeUuid};
77
use bevy_render::camera::Camera;
88
use bevy_render::extract_component::{ExtractComponent, ExtractComponentPlugin};
9-
use bevy_render::renderer::GPUDevice;
9+
use bevy_render::renderer::GpuDevice;
1010
use bevy_render::view::ViewTarget;
1111
use bevy_render::{render_resource::*, RenderApp, RenderStage};
1212

@@ -92,7 +92,7 @@ impl SpecializedRenderPipeline for TonemappingPipeline {
9292
impl FromWorld for TonemappingPipeline {
9393
fn from_world(render_world: &mut World) -> Self {
9494
let tonemap_texture_bind_group = render_world
95-
.resource::<GPUDevice>()
95+
.resource::<GpuDevice>()
9696
.create_bind_group_layout(&BindGroupLayoutDescriptor {
9797
label: Some("tonemapping_hdr_texture_bind_group_layout"),
9898
entries: &[

‎crates/bevy_core_pipeline/src/tonemapping/node.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use bevy_render::{
1010
PipelineCache, RenderPassColorAttachment, RenderPassDescriptor, SamplerDescriptor,
1111
TextureViewId,
1212
},
13-
renderer::GPUContext,
13+
renderer::GpuContext,
1414
view::{ExtractedView, ViewTarget},
1515
};
1616

@@ -42,7 +42,7 @@ impl Node for TonemappingNode {
4242
fn run(
4343
&self,
4444
graph: &mut RenderGraphContext,
45-
gpu_context: &mut GPUContext,
45+
gpu_context: &mut GpuContext,
4646
world: &World,
4747
) -> Result<(), NodeRunError> {
4848
let view_entity = graph.get_input_entity(Self::IN_VIEW)?;

‎crates/bevy_core_pipeline/src/upscaling/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use bevy_app::prelude::*;
33
use bevy_asset::{load_internal_asset, HandleUntyped};
44
use bevy_ecs::prelude::*;
55
use bevy_reflect::TypeUuid;
6-
use bevy_render::renderer::GPUDevice;
6+
use bevy_render::renderer::GpuDevice;
77
use bevy_render::view::ViewTarget;
88
use bevy_render::{render_resource::*, RenderApp, RenderStage};
99

@@ -41,7 +41,7 @@ pub struct UpscalingPipeline {
4141

4242
impl FromWorld for UpscalingPipeline {
4343
fn from_world(render_world: &mut World) -> Self {
44-
let gpu_device = render_world.resource::<GPUDevice>();
44+
let gpu_device = render_world.resource::<GpuDevice>();
4545

4646
let texture_bind_group = gpu_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
4747
label: Some("upscaling_texture_bind_group_layout"),

‎crates/bevy_core_pipeline/src/upscaling/node.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use bevy_render::{
99
PipelineCache, RenderPassColorAttachment, RenderPassDescriptor, SamplerDescriptor,
1010
TextureViewId,
1111
},
12-
renderer::GPUContext,
12+
renderer::GpuContext,
1313
view::{ExtractedView, ViewTarget},
1414
};
1515

@@ -43,7 +43,7 @@ impl Node for UpscalingNode {
4343
fn run(
4444
&self,
4545
graph: &mut RenderGraphContext,
46-
gpu_context: &mut GPUContext,
46+
gpu_context: &mut GpuContext,
4747
world: &World,
4848
) -> Result<(), NodeRunError> {
4949
let view_entity = graph.get_input_entity(Self::IN_VIEW)?;

‎crates/bevy_gltf/src/loader.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use bevy_render::{
2525
prelude::SpatialBundle,
2626
primitives::{Aabb, Frustum},
2727
render_resource::{AddressMode, Face, FilterMode, PrimitiveTopology, SamplerDescriptor},
28-
renderer::GPUDevice,
28+
renderer::GpuDevice,
2929
texture::{CompressedImageFormats, Image, ImageSampler, ImageType, TextureError},
3030
view::VisibleEntities,
3131
};
@@ -93,7 +93,7 @@ impl AssetLoader for GltfLoader {
9393

9494
impl FromWorld for GltfLoader {
9595
fn from_world(world: &mut World) -> Self {
96-
let supported_compressed_formats = match world.get_resource::<GPUDevice>() {
96+
let supported_compressed_formats = match world.get_resource::<GpuDevice>() {
9797
Some(gpu_device) => CompressedImageFormats::from_features(gpu_device.features()),
9898

9999
None => CompressedImageFormats::all(),

‎crates/bevy_internal/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ pub mod pbr {
136136
#[cfg(feature = "bevy_render")]
137137
pub mod render {
138138
//! Cameras, meshes, textures, shaders, and pipelines.
139-
//! Use [`GPUDevice::features`](crate::render::renderer::GPUDevice::features),
140-
//! [`GPUDevice::limits`](crate::render::renderer::GPUDevice::limits), and the
139+
//! Use [`GPUDevice::features`](crate::render::renderer::GpuDevice::features),
140+
//! [`GPUDevice::limits`](crate::render::renderer::GpuDevice::limits), and the
141141
//! [`WgpuAdapterInfo`](crate::render::render_resource::WgpuAdapterInfo) resource to
142142
//! get runtime information about the actual adapter, backend, features, and limits.
143143
pub use bevy_render::*;

‎crates/bevy_pbr/src/light.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use bevy_render::{
99
extract_resource::ExtractResource,
1010
primitives::{Aabb, CubemapFrusta, Frustum, Plane, Sphere},
1111
render_resource::BufferBindingType,
12-
renderer::GPUDevice,
12+
renderer::GpuDevice,
1313
view::{ComputedVisibility, RenderLayers, VisibleEntities},
1414
};
1515
use bevy_transform::{components::GlobalTransform, prelude::Transform};
@@ -863,7 +863,7 @@ pub(crate) fn assign_lights_to_clusters(
863863
mut lights: Local<Vec<PointLightAssignmentData>>,
864864
mut cluster_aabb_spheres: Local<Vec<Option<Sphere>>>,
865865
mut max_point_lights_warning_emitted: Local<bool>,
866-
gpu_device: Option<Res<GPUDevice>>,
866+
gpu_device: Option<Res<GpuDevice>>,
867867
) {
868868
let gpu_device = match gpu_device {
869869
Some(gpu_device) => gpu_device,

‎crates/bevy_pbr/src/material.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ use bevy_render::{
3535
PipelineCache, RenderPipelineDescriptor, Shader, ShaderRef, SpecializedMeshPipeline,
3636
SpecializedMeshPipelineError, SpecializedMeshPipelines,
3737
},
38-
renderer::GPUDevice,
38+
renderer::GpuDevice,
3939
texture::FallbackImage,
4040
view::{ExtractedView, Msaa, VisibleEntities},
4141
Extract, RenderApp, RenderStage,
@@ -266,7 +266,7 @@ where
266266
impl<M: Material> FromWorld for MaterialPipeline<M> {
267267
fn from_world(world: &mut World) -> Self {
268268
let asset_server = world.resource::<AssetServer>();
269-
let gpu_device = world.resource::<GPUDevice>();
269+
let gpu_device = world.resource::<GpuDevice>();
270270

271271
MaterialPipeline {
272272
mesh_pipeline: world.resource::<MeshPipeline>().clone(),
@@ -522,7 +522,7 @@ fn prepare_materials<M: Material>(
522522
mut prepare_next_frame: Local<PrepareNextFrameMaterials<M>>,
523523
mut extracted_assets: ResMut<ExtractedMaterials<M>>,
524524
mut render_materials: ResMut<RenderMaterials<M>>,
525-
gpu_device: Res<GPUDevice>,
525+
gpu_device: Res<GpuDevice>,
526526
images: Res<RenderAssets<Image>>,
527527
fallback_image: Res<FallbackImage>,
528528
pipeline: Res<MaterialPipeline<M>>,
@@ -557,7 +557,7 @@ fn prepare_materials<M: Material>(
557557

558558
fn prepare_material<M: Material>(
559559
material: &M,
560-
gpu_device: &GPUDevice,
560+
gpu_device: &GpuDevice,
561561
images: &RenderAssets<Image>,
562562
fallback_image: &FallbackImage,
563563
pipeline: &MaterialPipeline<M>,

‎crates/bevy_pbr/src/render/light.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use bevy_render::{
2323
TrackedRenderPass,
2424
},
2525
render_resource::*,
26-
renderer::{GPUContext, GPUDevice, GPUQueue},
26+
renderer::{GpuContext, GpuDevice, GpuQueue},
2727
texture::*,
2828
view::{
2929
ComputedVisibility, ExtractedView, ViewUniform, ViewUniformOffset, ViewUniforms,
@@ -141,7 +141,7 @@ impl GpuPointLights {
141141
}
142142
}
143143

144-
fn write_buffer(&mut self, gpu_device: &GPUDevice, gpu_queue: &GPUQueue) {
144+
fn write_buffer(&mut self, gpu_device: &GpuDevice, gpu_queue: &GpuQueue) {
145145
match self {
146146
GpuPointLights::Uniform(buffer) => buffer.write_buffer(gpu_device, gpu_queue),
147147
GpuPointLights::Storage(buffer) => buffer.write_buffer(gpu_device, gpu_queue),
@@ -226,7 +226,7 @@ pub struct ShadowPipeline {
226226
// TODO: this pattern for initializing the shaders / pipeline isn't ideal. this should be handled by the asset system
227227
impl FromWorld for ShadowPipeline {
228228
fn from_world(world: &mut World) -> Self {
229-
let gpu_device = world.resource::<GPUDevice>();
229+
let gpu_device = world.resource::<GpuDevice>();
230230

231231
let view_layout = gpu_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
232232
entries: &[
@@ -672,7 +672,7 @@ impl FromWorld for GlobalLightMeta {
672672
fn from_world(world: &mut World) -> Self {
673673
Self::new(
674674
world
675-
.resource::<GPUDevice>()
675+
.resource::<GpuDevice>()
676676
.get_supported_read_only_binding_type(CLUSTERED_FORWARD_STORAGE_BUFFER_COUNT),
677677
)
678678
}
@@ -759,8 +759,8 @@ pub(crate) fn spot_light_projection_matrix(angle: f32) -> Mat4 {
759759
pub fn prepare_lights(
760760
mut commands: Commands,
761761
mut texture_cache: ResMut<TextureCache>,
762-
gpu_device: Res<GPUDevice>,
763-
gpu_queue: Res<GPUQueue>,
762+
gpu_device: Res<GpuDevice>,
763+
gpu_queue: Res<GpuQueue>,
764764
mut global_light_meta: ResMut<GlobalLightMeta>,
765765
mut light_meta: ResMut<LightMeta>,
766766
views: Query<
@@ -1470,7 +1470,7 @@ impl ViewClusterBindings {
14701470
self.n_indices += 1;
14711471
}
14721472

1473-
pub fn write_buffers(&mut self, gpu_device: &GPUDevice, gpu_queue: &GPUQueue) {
1473+
pub fn write_buffers(&mut self, gpu_device: &GpuDevice, gpu_queue: &GpuQueue) {
14741474
match &mut self.buffers {
14751475
ViewClusterBuffers::Uniform {
14761476
cluster_light_index_lists,
@@ -1536,8 +1536,8 @@ impl ViewClusterBindings {
15361536

15371537
pub fn prepare_clusters(
15381538
mut commands: Commands,
1539-
gpu_device: Res<GPUDevice>,
1540-
gpu_queue: Res<GPUQueue>,
1539+
gpu_device: Res<GpuDevice>,
1540+
gpu_queue: Res<GpuQueue>,
15411541
mesh_pipeline: Res<MeshPipeline>,
15421542
global_light_meta: Res<GlobalLightMeta>,
15431543
views: Query<
@@ -1602,7 +1602,7 @@ pub fn prepare_clusters(
16021602
}
16031603

16041604
pub fn queue_shadow_view_bind_group(
1605-
gpu_device: Res<GPUDevice>,
1605+
gpu_device: Res<GpuDevice>,
16061606
shadow_pipeline: Res<ShadowPipeline>,
16071607
mut light_meta: ResMut<LightMeta>,
16081608
view_uniforms: Res<ViewUniforms>,
@@ -1757,7 +1757,7 @@ impl Node for ShadowPassNode {
17571757
fn run(
17581758
&self,
17591759
graph: &mut RenderGraphContext,
1760-
gpu_context: &mut GPUContext,
1760+
gpu_context: &mut GpuContext,
17611761
world: &World,
17621762
) -> Result<(), NodeRunError> {
17631763
let view_entity = graph.get_input_entity(Self::IN_VIEW)?;

0 commit comments

Comments
 (0)