@@ -99,7 +99,7 @@ impl ComputePass {
99
99
impl fmt:: Debug for ComputePass {
100
100
fn fmt ( & self , f : & mut fmt:: Formatter < ' _ > ) -> fmt:: Result {
101
101
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( ) ) ,
103
103
None => write ! ( f, "ComputePass {{ parent: None }}" ) ,
104
104
}
105
105
}
@@ -253,10 +253,10 @@ impl WebGpuError for ComputePassError {
253
253
}
254
254
}
255
255
256
- struct State < ' scope , ' snatch_guard , ' cmd_buf , ' raw_encoder > {
256
+ struct State < ' scope , ' snatch_guard , ' cmd_enc , ' raw_encoder > {
257
257
pipeline : Option < Arc < ComputePipeline > > ,
258
258
259
- general : pass:: BaseState < ' scope , ' snatch_guard , ' cmd_buf , ' raw_encoder > ,
259
+ general : pass:: BaseState < ' scope , ' snatch_guard , ' cmd_enc , ' raw_encoder > ,
260
260
261
261
active_query : Option < ( Arc < resource:: QuerySet > , u32 ) > ,
262
262
@@ -265,8 +265,8 @@ struct State<'scope, 'snatch_guard, 'cmd_buf, 'raw_encoder> {
265
265
intermediate_trackers : Tracker ,
266
266
}
267
267
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 >
270
270
{
271
271
fn is_ready ( & self ) -> Result < ( ) , DispatchError > {
272
272
if let Some ( pipeline) = self . pipeline . as_ref ( ) {
@@ -344,15 +344,15 @@ impl Global {
344
344
345
345
let label = desc. label . as_deref ( ) . map ( Cow :: Borrowed ) ;
346
346
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 ( ) ;
349
349
350
350
match cmd_buf_data. lock_encoder ( ) {
351
351
Ok ( ( ) ) => {
352
352
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 ( ) {
354
354
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) ) ,
356
356
None ,
357
357
) ;
358
358
}
@@ -362,7 +362,7 @@ impl Global {
362
362
. as_ref ( )
363
363
. map ( |tw| {
364
364
Self :: validate_pass_timestamp_writes :: < ComputePassErrorInner > (
365
- & cmd_buf . device ,
365
+ & cmd_enc . device ,
366
366
& hub. query_sets . read ( ) ,
367
367
tw,
368
368
)
@@ -374,10 +374,10 @@ impl Global {
374
374
label,
375
375
timestamp_writes,
376
376
} ;
377
- ( ComputePass :: new ( cmd_buf , arc_desc) , None )
377
+ ( ComputePass :: new ( cmd_enc , arc_desc) , None )
378
378
}
379
379
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) ) ,
381
381
None ,
382
382
) ,
383
383
}
@@ -389,7 +389,7 @@ impl Global {
389
389
cmd_buf_data. invalidate ( err. clone ( ) ) ;
390
390
drop ( cmd_buf_data) ;
391
391
(
392
- ComputePass :: new_invalid ( cmd_buf , & label, err. map_pass_err ( scope) ) ,
392
+ ComputePass :: new_invalid ( cmd_enc , & label, err. map_pass_err ( scope) ) ,
393
393
None ,
394
394
)
395
395
}
@@ -398,7 +398,7 @@ impl Global {
398
398
// generates an immediate validation error.
399
399
drop ( cmd_buf_data) ;
400
400
(
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) ) ,
402
402
Some ( err. into ( ) ) ,
403
403
)
404
404
}
@@ -410,7 +410,7 @@ impl Global {
410
410
// invalid pass to save that work.
411
411
drop ( cmd_buf_data) ;
412
412
(
413
- ComputePass :: new_invalid ( cmd_buf , & label, err. map_pass_err ( scope) ) ,
413
+ ComputePass :: new_invalid ( cmd_enc , & label, err. map_pass_err ( scope) ) ,
414
414
None ,
415
415
)
416
416
}
@@ -435,8 +435,8 @@ impl Global {
435
435
) {
436
436
#[ cfg( feature = "trace" ) ]
437
437
{
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 ( ) ;
440
440
let cmd_buf_data = cmd_buf_data. get_inner ( ) ;
441
441
442
442
if let Some ( ref mut list) = cmd_buf_data. commands {
@@ -494,8 +494,8 @@ impl Global {
494
494
pass. base. label. as_deref( ) . unwrap_or( "" )
495
495
) ;
496
496
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 ( ) ;
499
499
500
500
if let Some ( err) = pass. base . error . take ( ) {
501
501
if matches ! (
@@ -520,7 +520,7 @@ impl Global {
520
520
}
521
521
522
522
cmd_buf_data. unlock_and_record ( |cmd_buf_data| -> Result < ( ) , ComputePassError > {
523
- let device = & cmd_buf . device ;
523
+ let device = & cmd_enc . device ;
524
524
device. check_is_valid ( ) . map_pass_err ( pass_scope) ?;
525
525
526
526
let base = & mut pass. base ;
@@ -581,7 +581,7 @@ impl Global {
581
581
let timestamp_writes: Option < hal:: PassTimestampWrites < ' _ , dyn hal:: DynQuerySet > > =
582
582
if let Some ( tw) = pass. timestamp_writes . take ( ) {
583
583
tw. query_set
584
- . same_device_as ( cmd_buf . as_ref ( ) )
584
+ . same_device_as ( cmd_enc . as_ref ( ) )
585
585
. map_pass_err ( pass_scope) ?;
586
586
587
587
let query_set = state. general . tracker . query_sets . insert_single ( tw. query_set ) ;
@@ -636,7 +636,7 @@ impl Global {
636
636
let scope = PassErrorScope :: SetBindGroup ;
637
637
pass:: set_bind_group :: < ComputePassErrorInner > (
638
638
& mut state. general ,
639
- cmd_buf . as_ref ( ) ,
639
+ cmd_enc . as_ref ( ) ,
640
640
& base. dynamic_offsets ,
641
641
index,
642
642
num_dynamic_offsets,
@@ -647,7 +647,7 @@ impl Global {
647
647
}
648
648
ArcComputeCommand :: SetPipeline ( pipeline) => {
649
649
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) ?;
651
651
}
652
652
ArcComputeCommand :: SetPushConstant {
653
653
offset,
@@ -679,7 +679,7 @@ impl Global {
679
679
}
680
680
ArcComputeCommand :: DispatchIndirect { buffer, offset } => {
681
681
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)
683
683
. map_pass_err ( scope) ?;
684
684
}
685
685
ArcComputeCommand :: PushDebugGroup { color : _, len } => {
@@ -700,7 +700,7 @@ impl Global {
700
700
let scope = PassErrorScope :: WriteTimestamp ;
701
701
pass:: write_timestamp :: < ComputePassErrorInner > (
702
702
& mut state. general ,
703
- cmd_buf . as_ref ( ) ,
703
+ cmd_enc . as_ref ( ) ,
704
704
None ,
705
705
query_set,
706
706
query_index,
@@ -716,7 +716,7 @@ impl Global {
716
716
query_set,
717
717
state. general . raw_encoder ,
718
718
& mut state. general . tracker . query_sets ,
719
- cmd_buf . as_ref ( ) ,
719
+ cmd_enc . as_ref ( ) ,
720
720
query_index,
721
721
None ,
722
722
& mut state. active_query ,
@@ -781,10 +781,10 @@ impl Global {
781
781
782
782
fn set_pipeline (
783
783
state : & mut State ,
784
- cmd_buf : & CommandEncoder ,
784
+ cmd_enc : & CommandEncoder ,
785
785
pipeline : Arc < ComputePipeline > ,
786
786
) -> Result < ( ) , ComputePassErrorInner > {
787
- pipeline. same_device_as ( cmd_buf ) ?;
787
+ pipeline. same_device_as ( cmd_enc ) ?;
788
788
789
789
state. pipeline = Some ( pipeline. clone ( ) ) ;
790
790
@@ -858,11 +858,11 @@ fn dispatch(state: &mut State, groups: [u32; 3]) -> Result<(), ComputePassErrorI
858
858
859
859
fn dispatch_indirect (
860
860
state : & mut State ,
861
- cmd_buf : & CommandEncoder ,
861
+ cmd_enc : & CommandEncoder ,
862
862
buffer : Arc < Buffer > ,
863
863
offset : u64 ,
864
864
) -> Result < ( ) , ComputePassErrorInner > {
865
- buffer. same_device_as ( cmd_buf ) ?;
865
+ buffer. same_device_as ( cmd_enc ) ?;
866
866
867
867
state. is_ready ( ) ?;
868
868
0 commit comments