Skip to content

Commit c350117

Browse files
Firestar99LegNeato
authored andcommitted
rename args to match spec docs
1 parent a6e193d commit c350117

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

crates/spirv-std/src/arch/subgroup.rs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -409,19 +409,19 @@ pub fn subgroup_ballot(predicate: bool) -> SubgroupMask {
409409
#[spirv_std_macros::gpu_only]
410410
#[doc(alias = "OpGroupNonUniformInverseBallot")]
411411
#[inline]
412-
pub unsafe fn subgroup_inverse_ballot(subgroup_mask: SubgroupMask) -> bool {
412+
pub unsafe fn subgroup_inverse_ballot(value: SubgroupMask) -> bool {
413413
let mut result = false;
414414

415415
unsafe {
416416
asm! {
417417
"%bool = OpTypeBool",
418418
"%u32 = OpTypeInt 32 0",
419419
"%subgroup = OpConstant %u32 {subgroup}",
420-
"%subgroup_mask = OpLoad _ {subgroup_mask}",
421-
"%result = OpGroupNonUniformInverseBallot %bool %subgroup %subgroup_mask",
420+
"%value = OpLoad _ {value}",
421+
"%result = OpGroupNonUniformInverseBallot %bool %subgroup %value",
422422
"OpStore {result} %result",
423423
subgroup = const SUBGROUP,
424-
subgroup_mask = in(reg) &subgroup_mask,
424+
value = in(reg) &value,
425425
result = in(reg) &mut result,
426426
}
427427
}
@@ -447,21 +447,21 @@ pub unsafe fn subgroup_inverse_ballot(subgroup_mask: SubgroupMask) -> bool {
447447
#[spirv_std_macros::gpu_only]
448448
#[doc(alias = "OpGroupNonUniformBallotBitExtract")]
449449
#[inline]
450-
pub fn subgroup_ballot_bit_extract(subgroup_mask: SubgroupMask, id: u32) -> bool {
450+
pub fn subgroup_ballot_bit_extract(value: SubgroupMask, index: u32) -> bool {
451451
let mut result = false;
452452

453453
unsafe {
454454
asm! {
455455
"%bool = OpTypeBool",
456456
"%u32 = OpTypeInt 32 0",
457457
"%subgroup = OpConstant %u32 {subgroup}",
458-
"%subgroup_mask = OpLoad _ {subgroup_mask}",
459-
"%id = OpLoad _ {id}",
460-
"%result = OpGroupNonUniformBallotBitExtract %bool %subgroup %subgroup_mask %id",
458+
"%value = OpLoad _ {value}",
459+
"%index = OpLoad _ {index}",
460+
"%result = OpGroupNonUniformBallotBitExtract %bool %subgroup %value %index",
461461
"OpStore {result} %result",
462462
subgroup = const SUBGROUP,
463-
subgroup_mask = in(reg) &subgroup_mask,
464-
id = in(reg) &id,
463+
value = in(reg) &value,
464+
index = in(reg) &index,
465465
result = in(reg) &mut result,
466466
}
467467
}
@@ -487,19 +487,19 @@ macro_rules! macro_subgroup_ballot_bit_count {
487487
#[spirv_std_macros::gpu_only]
488488
#[doc(alias = "OpGroupNonUniformBallotBitCount")]
489489
#[inline]
490-
pub fn $name(subgroup_mask: SubgroupMask) -> u32 {
490+
pub fn $name(value: SubgroupMask) -> u32 {
491491
let mut result = 0;
492492

493493
unsafe {
494494
asm! {
495495
"%u32 = OpTypeInt 32 0",
496496
"%subgroup = OpConstant %u32 {subgroup}",
497-
"%subgroup_mask = OpLoad _ {subgroup_mask}",
498-
"%result = OpGroupNonUniformBallotBitCount %u32 %subgroup {groupop} %subgroup_mask",
497+
"%value = OpLoad _ {value}",
498+
"%result = OpGroupNonUniformBallotBitCount %u32 %subgroup {groupop} %value",
499499
"OpStore {result} %result",
500500
subgroup = const SUBGROUP,
501501
groupop = const ($group_op as u32),
502-
subgroup_mask = in(reg) &subgroup_mask,
502+
value = in(reg) &value,
503503
result = in(reg) &mut result,
504504
}
505505
}
@@ -533,18 +533,18 @@ macro_subgroup_ballot_bit_count!(
533533
#[spirv_std_macros::gpu_only]
534534
#[doc(alias = "OpGroupNonUniformBallotFindLSB")]
535535
#[inline]
536-
pub fn subgroup_ballot_find_lsb(subgroup_mask: SubgroupMask) -> u32 {
536+
pub fn subgroup_ballot_find_lsb(value: SubgroupMask) -> u32 {
537537
let mut result = 0;
538538

539539
unsafe {
540540
asm! {
541541
"%u32 = OpTypeInt 32 0",
542542
"%subgroup = OpConstant %u32 {subgroup}",
543-
"%subgroup_mask = OpLoad _ {subgroup_mask}",
544-
"%result = OpGroupNonUniformBallotFindLSB %u32 %subgroup %subgroup_mask",
543+
"%value = OpLoad _ {value}",
544+
"%result = OpGroupNonUniformBallotFindLSB %u32 %subgroup %value",
545545
"OpStore {result} %result",
546546
subgroup = const SUBGROUP,
547-
subgroup_mask = in(reg) &subgroup_mask,
547+
value = in(reg) &value,
548548
result = in(reg) &mut result,
549549
}
550550
}
@@ -566,18 +566,18 @@ pub fn subgroup_ballot_find_lsb(subgroup_mask: SubgroupMask) -> u32 {
566566
#[spirv_std_macros::gpu_only]
567567
#[doc(alias = "OpGroupNonUniformBallotFindMSB")]
568568
#[inline]
569-
pub fn subgroup_ballot_find_msb(subgroup_mask: SubgroupMask) -> u32 {
569+
pub fn subgroup_ballot_find_msb(value: SubgroupMask) -> u32 {
570570
let mut result = 0;
571571

572572
unsafe {
573573
asm! {
574574
"%u32 = OpTypeInt 32 0",
575575
"%subgroup = OpConstant %u32 {subgroup}",
576-
"%subgroup_mask = OpLoad _ {subgroup_mask}",
577-
"%result = OpGroupNonUniformBallotFindMSB %u32 %subgroup %subgroup_mask",
576+
"%value = OpLoad _ {value}",
577+
"%result = OpGroupNonUniformBallotFindMSB %u32 %subgroup %value",
578578
"OpStore {result} %result",
579579
subgroup = const SUBGROUP,
580-
subgroup_mask = in(reg) &subgroup_mask,
580+
value = in(reg) &value,
581581
result = in(reg) &mut result,
582582
}
583583
}
@@ -1277,20 +1277,20 @@ Requires Capability `GroupNonUniformArithmetic` and `GroupNonUniformClustered`.
12771277
#[spirv_std_macros::gpu_only]
12781278
#[doc(alias = "OpGroupNonUniformQuadBroadcast")]
12791279
#[inline]
1280-
pub unsafe fn subgroup_quad_broadcast<T: VectorOrScalar>(value: T, id: u32) -> T {
1280+
pub unsafe fn subgroup_quad_broadcast<T: VectorOrScalar>(value: T, index: u32) -> T {
12811281
let mut result = T::default();
12821282

12831283
unsafe {
12841284
asm! {
12851285
"%u32 = OpTypeInt 32 0",
12861286
"%subgroup = OpConstant %u32 {subgroup}",
12871287
"%value = OpLoad _ {value}",
1288-
"%id = OpLoad _ {id}",
1289-
"%result = OpGroupNonUniformQuadBroadcast _ %subgroup %value %id",
1288+
"%index = OpLoad _ {index}",
1289+
"%result = OpGroupNonUniformQuadBroadcast _ %subgroup %value %index",
12901290
"OpStore {result} %result",
12911291
subgroup = const SUBGROUP,
12921292
value = in(reg) &value,
1293-
id = in(reg) &id,
1293+
index = in(reg) &index,
12941294
result = in(reg) &mut result,
12951295
}
12961296
}

0 commit comments

Comments
 (0)