Skip to content

Commit b8c5c4a

Browse files
teoxoyteoxoy
committed
rename cmd_buf to cmd_enc where appropriate
1 parent 63f3df8 commit b8c5c4a

File tree

10 files changed

+148
-148
lines changed

10 files changed

+148
-148
lines changed

‎wgpu-core/src/as_hal.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,8 @@ impl Global {
346346

347347
let hub = &self.hub;
348348

349-
let cmd_buf = hub.command_encoders.get(id);
350-
let mut cmd_buf_data = cmd_buf.data.lock();
349+
let cmd_enc = hub.command_encoders.get(id);
350+
let mut cmd_buf_data = cmd_enc.data.lock();
351351
cmd_buf_data.record_as_hal_mut(|opt_cmd_buf| -> R {
352352
hal_command_encoder_callback(opt_cmd_buf.and_then(|cmd_buf| {
353353
cmd_buf

‎wgpu-core/src/command/clear.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,19 @@ impl Global {
115115

116116
let hub = &self.hub;
117117

118-
let cmd_buf = hub.command_encoders.get(command_encoder_id);
119-
let mut cmd_buf_data = cmd_buf.data.lock();
118+
let cmd_enc = hub.command_encoders.get(command_encoder_id);
119+
let mut cmd_buf_data = cmd_enc.data.lock();
120120
cmd_buf_data.record_with(|cmd_buf_data| -> Result<(), ClearError> {
121121
#[cfg(feature = "trace")]
122122
if let Some(ref mut list) = cmd_buf_data.commands {
123123
list.push(TraceCommand::ClearBuffer { dst, offset, size });
124124
}
125125

126-
cmd_buf.device.check_is_valid()?;
126+
cmd_enc.device.check_is_valid()?;
127127

128128
let dst_buffer = hub.buffers.get(dst).get()?;
129129

130-
dst_buffer.same_device_as(cmd_buf.as_ref())?;
130+
dst_buffer.same_device_as(cmd_enc.as_ref())?;
131131

132132
let dst_pending = cmd_buf_data
133133
.trackers
@@ -200,8 +200,8 @@ impl Global {
200200

201201
let hub = &self.hub;
202202

203-
let cmd_buf = hub.command_encoders.get(command_encoder_id);
204-
let mut cmd_buf_data = cmd_buf.data.lock();
203+
let cmd_enc = hub.command_encoders.get(command_encoder_id);
204+
let mut cmd_buf_data = cmd_enc.data.lock();
205205
cmd_buf_data.record_with(|cmd_buf_data| -> Result<(), ClearError> {
206206
#[cfg(feature = "trace")]
207207
if let Some(ref mut list) = cmd_buf_data.commands {
@@ -211,15 +211,15 @@ impl Global {
211211
});
212212
}
213213

214-
cmd_buf.device.check_is_valid()?;
214+
cmd_enc.device.check_is_valid()?;
215215

216-
cmd_buf
216+
cmd_enc
217217
.device
218218
.require_features(wgt::Features::CLEAR_TEXTURE)?;
219219

220220
let dst_texture = hub.textures.get(dst).get()?;
221221

222-
dst_texture.same_device_as(cmd_buf.as_ref())?;
222+
dst_texture.same_device_as(cmd_enc.as_ref())?;
223223

224224
// Check if subresource aspects are valid.
225225
let clear_aspects =
@@ -256,7 +256,7 @@ impl Global {
256256
});
257257
}
258258

259-
let device = &cmd_buf.device;
259+
let device = &cmd_enc.device;
260260
device.check_is_valid()?;
261261
let (encoder, tracker) = cmd_buf_data.open_encoder_and_tracker()?;
262262

‎wgpu-core/src/command/compute.rs‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl ComputePass {
9999
impl fmt::Debug for ComputePass {
100100
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
101101
match self.parent {
102-
Some(ref cmd_buf) => write!(f, "ComputePass {{ parent: {} }}", cmd_buf.error_ident()),
102+
Some(ref cmd_enc) => write!(f, "ComputePass {{ parent: {} }}", cmd_enc.error_ident()),
103103
None => write!(f, "ComputePass {{ parent: None }}"),
104104
}
105105
}
@@ -253,10 +253,10 @@ impl WebGpuError for ComputePassError {
253253
}
254254
}
255255

256-
struct State<'scope, 'snatch_guard, 'cmd_buf, 'raw_encoder> {
256+
struct State<'scope, 'snatch_guard, 'cmd_enc, 'raw_encoder> {
257257
pipeline: Option<Arc<ComputePipeline>>,
258258

259-
general: pass::BaseState<'scope, 'snatch_guard, 'cmd_buf, 'raw_encoder>,
259+
general: pass::BaseState<'scope, 'snatch_guard, 'cmd_enc, 'raw_encoder>,
260260

261261
active_query: Option<(Arc<resource::QuerySet>, u32)>,
262262

@@ -265,8 +265,8 @@ struct State<'scope, 'snatch_guard, 'cmd_buf, 'raw_encoder> {
265265
intermediate_trackers: Tracker,
266266
}
267267

268-
impl<'scope, 'snatch_guard, 'cmd_buf, 'raw_encoder>
269-
State<'scope, 'snatch_guard, 'cmd_buf, 'raw_encoder>
268+
impl<'scope, 'snatch_guard, 'cmd_enc, 'raw_encoder>
269+
State<'scope, 'snatch_guard, 'cmd_enc, 'raw_encoder>
270270
{
271271
fn is_ready(&self) -> Result<(), DispatchError> {
272272
if let Some(pipeline) = self.pipeline.as_ref() {
@@ -344,15 +344,15 @@ impl Global {
344344

345345
let label = desc.label.as_deref().map(Cow::Borrowed);
346346

347-
let cmd_buf = hub.command_encoders.get(encoder_id);
348-
let mut cmd_buf_data = cmd_buf.data.lock();
347+
let cmd_enc = hub.command_encoders.get(encoder_id);
348+
let mut cmd_buf_data = cmd_enc.data.lock();
349349

350350
match cmd_buf_data.lock_encoder() {
351351
Ok(()) => {
352352
drop(cmd_buf_data);
353-
if let Err(err) = cmd_buf.device.check_is_valid() {
353+
if let Err(err) = cmd_enc.device.check_is_valid() {
354354
return (
355-
ComputePass::new_invalid(cmd_buf, &label, err.map_pass_err(scope)),
355+
ComputePass::new_invalid(cmd_enc, &label, err.map_pass_err(scope)),
356356
None,
357357
);
358358
}
@@ -362,7 +362,7 @@ impl Global {
362362
.as_ref()
363363
.map(|tw| {
364364
Self::validate_pass_timestamp_writes::<ComputePassErrorInner>(
365-
&cmd_buf.device,
365+
&cmd_enc.device,
366366
&hub.query_sets.read(),
367367
tw,
368368
)
@@ -374,10 +374,10 @@ impl Global {
374374
label,
375375
timestamp_writes,
376376
};
377-
(ComputePass::new(cmd_buf, arc_desc), None)
377+
(ComputePass::new(cmd_enc, arc_desc), None)
378378
}
379379
Err(err) => (
380-
ComputePass::new_invalid(cmd_buf, &label, err.map_pass_err(scope)),
380+
ComputePass::new_invalid(cmd_enc, &label, err.map_pass_err(scope)),
381381
None,
382382
),
383383
}
@@ -389,7 +389,7 @@ impl Global {
389389
cmd_buf_data.invalidate(err.clone());
390390
drop(cmd_buf_data);
391391
(
392-
ComputePass::new_invalid(cmd_buf, &label, err.map_pass_err(scope)),
392+
ComputePass::new_invalid(cmd_enc, &label, err.map_pass_err(scope)),
393393
None,
394394
)
395395
}
@@ -398,7 +398,7 @@ impl Global {
398398
// generates an immediate validation error.
399399
drop(cmd_buf_data);
400400
(
401-
ComputePass::new_invalid(cmd_buf, &label, err.clone().map_pass_err(scope)),
401+
ComputePass::new_invalid(cmd_enc, &label, err.clone().map_pass_err(scope)),
402402
Some(err.into()),
403403
)
404404
}
@@ -410,7 +410,7 @@ impl Global {
410410
// invalid pass to save that work.
411411
drop(cmd_buf_data);
412412
(
413-
ComputePass::new_invalid(cmd_buf, &label, err.map_pass_err(scope)),
413+
ComputePass::new_invalid(cmd_enc, &label, err.map_pass_err(scope)),
414414
None,
415415
)
416416
}
@@ -435,8 +435,8 @@ impl Global {
435435
) {
436436
#[cfg(feature = "trace")]
437437
{
438-
let cmd_buf = self.hub.command_encoders.get(encoder_id);
439-
let mut cmd_buf_data = cmd_buf.data.lock();
438+
let cmd_enc = self.hub.command_encoders.get(encoder_id);
439+
let mut cmd_buf_data = cmd_enc.data.lock();
440440
let cmd_buf_data = cmd_buf_data.get_inner();
441441

442442
if let Some(ref mut list) = cmd_buf_data.commands {
@@ -494,8 +494,8 @@ impl Global {
494494
pass.base.label.as_deref().unwrap_or("")
495495
);
496496

497-
let cmd_buf = pass.parent.take().ok_or(EncoderStateError::Ended)?;
498-
let mut cmd_buf_data = cmd_buf.data.lock();
497+
let cmd_enc = pass.parent.take().ok_or(EncoderStateError::Ended)?;
498+
let mut cmd_buf_data = cmd_enc.data.lock();
499499

500500
if let Some(err) = pass.base.error.take() {
501501
if matches!(
@@ -520,7 +520,7 @@ impl Global {
520520
}
521521

522522
cmd_buf_data.unlock_and_record(|cmd_buf_data| -> Result<(), ComputePassError> {
523-
let device = &cmd_buf.device;
523+
let device = &cmd_enc.device;
524524
device.check_is_valid().map_pass_err(pass_scope)?;
525525

526526
let base = &mut pass.base;
@@ -581,7 +581,7 @@ impl Global {
581581
let timestamp_writes: Option<hal::PassTimestampWrites<'_, dyn hal::DynQuerySet>> =
582582
if let Some(tw) = pass.timestamp_writes.take() {
583583
tw.query_set
584-
.same_device_as(cmd_buf.as_ref())
584+
.same_device_as(cmd_enc.as_ref())
585585
.map_pass_err(pass_scope)?;
586586

587587
let query_set = state.general.tracker.query_sets.insert_single(tw.query_set);
@@ -636,7 +636,7 @@ impl Global {
636636
let scope = PassErrorScope::SetBindGroup;
637637
pass::set_bind_group::<ComputePassErrorInner>(
638638
&mut state.general,
639-
cmd_buf.as_ref(),
639+
cmd_enc.as_ref(),
640640
&base.dynamic_offsets,
641641
index,
642642
num_dynamic_offsets,
@@ -647,7 +647,7 @@ impl Global {
647647
}
648648
ArcComputeCommand::SetPipeline(pipeline) => {
649649
let scope = PassErrorScope::SetPipelineCompute;
650-
set_pipeline(&mut state, cmd_buf.as_ref(), pipeline).map_pass_err(scope)?;
650+
set_pipeline(&mut state, cmd_enc.as_ref(), pipeline).map_pass_err(scope)?;
651651
}
652652
ArcComputeCommand::SetPushConstant {
653653
offset,
@@ -679,7 +679,7 @@ impl Global {
679679
}
680680
ArcComputeCommand::DispatchIndirect { buffer, offset } => {
681681
let scope = PassErrorScope::Dispatch { indirect: true };
682-
dispatch_indirect(&mut state, cmd_buf.as_ref(), buffer, offset)
682+
dispatch_indirect(&mut state, cmd_enc.as_ref(), buffer, offset)
683683
.map_pass_err(scope)?;
684684
}
685685
ArcComputeCommand::PushDebugGroup { color: _, len } => {
@@ -700,7 +700,7 @@ impl Global {
700700
let scope = PassErrorScope::WriteTimestamp;
701701
pass::write_timestamp::<ComputePassErrorInner>(
702702
&mut state.general,
703-
cmd_buf.as_ref(),
703+
cmd_enc.as_ref(),
704704
None,
705705
query_set,
706706
query_index,
@@ -716,7 +716,7 @@ impl Global {
716716
query_set,
717717
state.general.raw_encoder,
718718
&mut state.general.tracker.query_sets,
719-
cmd_buf.as_ref(),
719+
cmd_enc.as_ref(),
720720
query_index,
721721
None,
722722
&mut state.active_query,
@@ -781,10 +781,10 @@ impl Global {
781781

782782
fn set_pipeline(
783783
state: &mut State,
784-
cmd_buf: &CommandEncoder,
784+
cmd_enc: &CommandEncoder,
785785
pipeline: Arc<ComputePipeline>,
786786
) -> Result<(), ComputePassErrorInner> {
787-
pipeline.same_device_as(cmd_buf)?;
787+
pipeline.same_device_as(cmd_enc)?;
788788

789789
state.pipeline = Some(pipeline.clone());
790790

@@ -858,11 +858,11 @@ fn dispatch(state: &mut State, groups: [u32; 3]) -> Result<(), ComputePassErrorI
858858

859859
fn dispatch_indirect(
860860
state: &mut State,
861-
cmd_buf: &CommandEncoder,
861+
cmd_enc: &CommandEncoder,
862862
buffer: Arc<Buffer>,
863863
offset: u64,
864864
) -> Result<(), ComputePassErrorInner> {
865-
buffer.same_device_as(cmd_buf)?;
865+
buffer.same_device_as(cmd_enc)?;
866866

867867
state.is_ready()?;
868868

‎wgpu-core/src/command/mod.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,18 +1180,18 @@ impl Global {
11801180

11811181
let hub = &self.hub;
11821182

1183-
let cmd_buf = hub.command_encoders.get(encoder_id);
1184-
let mut cmd_buf_data = cmd_buf.data.lock();
1183+
let cmd_enc = hub.command_encoders.get(encoder_id);
1184+
let mut cmd_buf_data = cmd_enc.data.lock();
11851185
cmd_buf_data.record_with(|cmd_buf_data| -> Result<(), CommandEncoderError> {
11861186
#[cfg(feature = "trace")]
11871187
if let Some(ref mut list) = cmd_buf_data.commands {
11881188
list.push(TraceCommand::PushDebugGroup(label.to_owned()));
11891189
}
11901190

1191-
cmd_buf.device.check_is_valid()?;
1191+
cmd_enc.device.check_is_valid()?;
11921192

11931193
let cmd_buf_raw = cmd_buf_data.encoder.open()?;
1194-
if !cmd_buf
1194+
if !cmd_enc
11951195
.device
11961196
.instance_flags
11971197
.contains(wgt::InstanceFlags::DISCARD_HAL_LABELS)
@@ -1215,17 +1215,17 @@ impl Global {
12151215

12161216
let hub = &self.hub;
12171217

1218-
let cmd_buf = hub.command_encoders.get(encoder_id);
1219-
let mut cmd_buf_data = cmd_buf.data.lock();
1218+
let cmd_enc = hub.command_encoders.get(encoder_id);
1219+
let mut cmd_buf_data = cmd_enc.data.lock();
12201220
cmd_buf_data.record_with(|cmd_buf_data| -> Result<(), CommandEncoderError> {
12211221
#[cfg(feature = "trace")]
12221222
if let Some(ref mut list) = cmd_buf_data.commands {
12231223
list.push(TraceCommand::InsertDebugMarker(label.to_owned()));
12241224
}
12251225

1226-
cmd_buf.device.check_is_valid()?;
1226+
cmd_enc.device.check_is_valid()?;
12271227

1228-
if !cmd_buf
1228+
if !cmd_enc
12291229
.device
12301230
.instance_flags
12311231
.contains(wgt::InstanceFlags::DISCARD_HAL_LABELS)
@@ -1249,18 +1249,18 @@ impl Global {
12491249

12501250
let hub = &self.hub;
12511251

1252-
let cmd_buf = hub.command_encoders.get(encoder_id);
1253-
let mut cmd_buf_data = cmd_buf.data.lock();
1252+
let cmd_enc = hub.command_encoders.get(encoder_id);
1253+
let mut cmd_buf_data = cmd_enc.data.lock();
12541254
cmd_buf_data.record_with(|cmd_buf_data| -> Result<(), CommandEncoderError> {
12551255
#[cfg(feature = "trace")]
12561256
if let Some(ref mut list) = cmd_buf_data.commands {
12571257
list.push(TraceCommand::PopDebugGroup);
12581258
}
12591259

1260-
cmd_buf.device.check_is_valid()?;
1260+
cmd_enc.device.check_is_valid()?;
12611261

12621262
let cmd_buf_raw = cmd_buf_data.encoder.open()?;
1263-
if !cmd_buf
1263+
if !cmd_enc
12641264
.device
12651265
.instance_flags
12661266
.contains(wgt::InstanceFlags::DISCARD_HAL_LABELS)

0 commit comments

Comments
 (0)