Skip to content

Commit 3d0967a

Browse files
kurtkuehnertkurtkuehnert
committed
renamed occurrences of the variable name device that refer to a GPUDevice to gpu_device
renamed occurrences of the variable name `queue` that refer to a `GPUQueue` to `gpu_queue`
1 parent 753da19 commit 3d0967a

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎crates/bevy_render/src/render_resource/buffer_vec.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ impl<T: Pod> BufferVec<T> {
100100
/// In addition to any [`BufferUsages`](crate::render_resource::BufferUsages) provided when
101101
/// the `BufferVec` was created, the buffer on the [`GPUDevice`](crate::renderer::GPUDevice)
102102
/// is marked as [`BufferUsages::COPY_DST`](crate::render_resource::BufferUsages).
103-
pub fn reserve(&mut self, capacity: usize, device: &GPUDevice) {
103+
pub fn reserve(&mut self, capacity: usize, gpu_device: &GPUDevice) {
104104
if capacity > self.capacity || self.label_changed {
105105
self.capacity = capacity;
106106
let size = self.item_size * capacity;
107-
self.buffer = Some(device.create_buffer(&wgpu::BufferDescriptor {
107+
self.buffer = Some(gpu_device.create_buffer(&wgpu::BufferDescriptor {
108108
label: self.label.as_deref(),
109109
size: size as wgpu::BufferAddress,
110110
usage: BufferUsages::COPY_DST | self.buffer_usage,
@@ -119,15 +119,15 @@ impl<T: Pod> BufferVec<T> {
119119
///
120120
/// Before queuing the write, a [`reserve`](crate::render_resource::BufferVec::reserve) operation
121121
/// is executed.
122-
pub fn write_buffer(&mut self, device: &GPUDevice, queue: &GPUQueue) {
122+
pub fn write_buffer(&mut self, gpu_device: &GPUDevice, gpu_queue: &GPUQueue) {
123123
if self.values.is_empty() {
124124
return;
125125
}
126-
self.reserve(self.values.len(), device);
126+
self.reserve(self.values.len(), gpu_device);
127127
if let Some(buffer) = &self.buffer {
128128
let range = 0..self.item_size * self.values.len();
129129
let bytes: &[u8] = cast_slice(&self.values);
130-
queue.write_buffer(buffer, 0, &bytes[range]);
130+
gpu_queue.write_buffer(buffer, 0, &bytes[range]);
131131
}
132132
}
133133

‎crates/bevy_render/src/render_resource/pipeline_cache.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ impl LayoutCache {
339339
pub struct PipelineCache {
340340
layout_cache: LayoutCache,
341341
shader_cache: ShaderCache,
342-
device: GPUDevice,
342+
gpu_device: GPUDevice,
343343
pipelines: Vec<CachedPipeline>,
344344
waiting_pipelines: HashSet<CachedPipelineId>,
345345
}
@@ -350,9 +350,9 @@ impl PipelineCache {
350350
}
351351

352352
/// Create a new pipeline cache associated with the given render device.
353-
pub fn new(device: GPUDevice) -> Self {
353+
pub fn new(gpu_device: GPUDevice) -> Self {
354354
Self {
355-
device,
355+
gpu_device,
356356
layout_cache: default(),
357357
shader_cache: default(),
358358
waiting_pipelines: default(),
@@ -514,7 +514,7 @@ impl PipelineCache {
514514
descriptor: &RenderPipelineDescriptor,
515515
) -> CachedPipelineState {
516516
let vertex_module = match self.shader_cache.get(
517-
&self.device,
517+
&self.gpu_device,
518518
id,
519519
&descriptor.vertex.shader,
520520
&descriptor.vertex.shader_defs,
@@ -527,7 +527,7 @@ impl PipelineCache {
527527

528528
let fragment_data = if let Some(fragment) = &descriptor.fragment {
529529
let fragment_module = match self.shader_cache.get(
530-
&self.device,
530+
&self.gpu_device,
531531
id,
532532
&fragment.shader,
533533
&fragment.shader_defs,
@@ -558,7 +558,7 @@ impl PipelineCache {
558558
.collect::<Vec<_>>();
559559

560560
let layout = if let Some(layout) = &descriptor.layout {
561-
Some(self.layout_cache.get(&self.device, layout))
561+
Some(self.layout_cache.get(&self.gpu_device, layout))
562562
} else {
563563
None
564564
};
@@ -584,7 +584,7 @@ impl PipelineCache {
584584
}),
585585
};
586586

587-
let pipeline = self.device.create_render_pipeline(&descriptor);
587+
let pipeline = self.gpu_device.create_render_pipeline(&descriptor);
588588

589589
CachedPipelineState::Ok(Pipeline::RenderPipeline(pipeline))
590590
}
@@ -595,7 +595,7 @@ impl PipelineCache {
595595
descriptor: &ComputePipelineDescriptor,
596596
) -> CachedPipelineState {
597597
let compute_module = match self.shader_cache.get(
598-
&self.device,
598+
&self.gpu_device,
599599
id,
600600
&descriptor.shader,
601601
&descriptor.shader_defs,
@@ -607,7 +607,7 @@ impl PipelineCache {
607607
};
608608

609609
let layout = if let Some(layout) = &descriptor.layout {
610-
Some(self.layout_cache.get(&self.device, layout))
610+
Some(self.layout_cache.get(&self.gpu_device, layout))
611611
} else {
612612
None
613613
};
@@ -619,7 +619,7 @@ impl PipelineCache {
619619
entry_point: descriptor.entry_point.as_ref(),
620620
};
621621

622-
let pipeline = self.device.create_compute_pipeline(&descriptor);
622+
let pipeline = self.gpu_device.create_compute_pipeline(&descriptor);
623623

624624
CachedPipelineState::Ok(Pipeline::ComputePipeline(pipeline))
625625
}

‎crates/bevy_render/src/render_resource/storage_buffer.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,21 +106,21 @@ impl<T: ShaderType + WriteInto> StorageBuffer<T> {
106106
///
107107
/// If there is no GPU-side buffer allocated to hold the data currently stored, or if a GPU-side buffer previously
108108
/// allocated does not have enough capacity, a new GPU-side buffer is created.
109-
pub fn write_buffer(&mut self, device: &GPUDevice, queue: &GPUQueue) {
109+
pub fn write_buffer(&mut self, gpu_device: &GPUDevice, gpu_queue: &GPUQueue) {
110110
self.scratch.write(&self.value).unwrap();
111111

112112
let size = self.scratch.as_ref().len();
113113

114114
if self.capacity < size || self.label_changed {
115-
self.buffer = Some(device.create_buffer_with_data(&BufferInitDescriptor {
115+
self.buffer = Some(gpu_device.create_buffer_with_data(&BufferInitDescriptor {
116116
label: self.label.as_deref(),
117117
usage: BufferUsages::COPY_DST | BufferUsages::STORAGE,
118118
contents: self.scratch.as_ref(),
119119
}));
120120
self.capacity = size;
121121
self.label_changed = false;
122122
} else if let Some(buffer) = &self.buffer {
123-
queue.write_buffer(buffer, 0, self.scratch.as_ref());
123+
gpu_queue.write_buffer(buffer, 0, self.scratch.as_ref());
124124
}
125125
}
126126
}
@@ -215,19 +215,19 @@ impl<T: ShaderType + WriteInto> DynamicStorageBuffer<T> {
215215
}
216216

217217
#[inline]
218-
pub fn write_buffer(&mut self, device: &GPUDevice, queue: &GPUQueue) {
218+
pub fn write_buffer(&mut self, gpu_device: &GPUDevice, gpu_queue: &GPUQueue) {
219219
let size = self.scratch.as_ref().len();
220220

221221
if self.capacity < size || self.label_changed {
222-
self.buffer = Some(device.create_buffer_with_data(&BufferInitDescriptor {
222+
self.buffer = Some(gpu_device.create_buffer_with_data(&BufferInitDescriptor {
223223
label: self.label.as_deref(),
224224
usage: BufferUsages::COPY_DST | BufferUsages::STORAGE,
225225
contents: self.scratch.as_ref(),
226226
}));
227227
self.capacity = size;
228228
self.label_changed = false;
229229
} else if let Some(buffer) = &self.buffer {
230-
queue.write_buffer(buffer, 0, self.scratch.as_ref());
230+
gpu_queue.write_buffer(buffer, 0, self.scratch.as_ref());
231231
}
232232
}
233233

‎crates/bevy_render/src/render_resource/uniform_buffer.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,18 @@ impl<T: ShaderType + WriteInto> UniformBuffer<T> {
104104
///
105105
/// If a GPU-side buffer does not already exist for this data, such a buffer is initialized with currently
106106
/// available data.
107-
pub fn write_buffer(&mut self, device: &GPUDevice, queue: &GPUQueue) {
107+
pub fn write_buffer(&mut self, gpu_device: &GPUDevice, gpu_queue: &GPUQueue) {
108108
self.scratch.write(&self.value).unwrap();
109109

110110
if self.label_changed || self.buffer.is_none() {
111-
self.buffer = Some(device.create_buffer_with_data(&BufferInitDescriptor {
111+
self.buffer = Some(gpu_device.create_buffer_with_data(&BufferInitDescriptor {
112112
label: self.label.as_deref(),
113113
usage: BufferUsages::COPY_DST | BufferUsages::UNIFORM,
114114
contents: self.scratch.as_ref(),
115115
}));
116116
self.label_changed = false;
117117
} else if let Some(buffer) = &self.buffer {
118-
queue.write_buffer(buffer, 0, self.scratch.as_ref());
118+
gpu_queue.write_buffer(buffer, 0, self.scratch.as_ref());
119119
}
120120
}
121121
}
@@ -214,19 +214,19 @@ impl<T: ShaderType + WriteInto> DynamicUniformBuffer<T> {
214214
/// If there is no GPU-side buffer allocated to hold the data currently stored, or if a GPU-side buffer previously
215215
/// allocated does not have enough capacity, a new GPU-side buffer is created.
216216
#[inline]
217-
pub fn write_buffer(&mut self, device: &GPUDevice, queue: &GPUQueue) {
217+
pub fn write_buffer(&mut self, gpu_device: &GPUDevice, gpu_queue: &GPUQueue) {
218218
let size = self.scratch.as_ref().len();
219219

220220
if self.capacity < size || self.label_changed {
221-
self.buffer = Some(device.create_buffer_with_data(&BufferInitDescriptor {
221+
self.buffer = Some(gpu_device.create_buffer_with_data(&BufferInitDescriptor {
222222
label: self.label.as_deref(),
223223
usage: BufferUsages::COPY_DST | BufferUsages::UNIFORM,
224224
contents: self.scratch.as_ref(),
225225
}));
226226
self.capacity = size;
227227
self.label_changed = false;
228228
} else if let Some(buffer) = &self.buffer {
229-
queue.write_buffer(buffer, 0, self.scratch.as_ref());
229+
gpu_queue.write_buffer(buffer, 0, self.scratch.as_ref());
230230
}
231231
}
232232

‎crates/bevy_render/src/texture/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ impl Plugin for ImagePlugin {
9595

9696
if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {
9797
let default_sampler = {
98-
let device = render_app.world.resource::<GPUDevice>();
99-
device.create_sampler(&self.default_sampler.clone())
98+
let gpu_device = render_app.world.resource::<GPUDevice>();
99+
gpu_device.create_sampler(&self.default_sampler.clone())
100100
};
101101
render_app
102102
.insert_resource(DefaultImageSampler(default_sampler))

0 commit comments

Comments
 (0)