Skip to content

Commit 9c1ddb7

Browse files
jimblandyteoxoy
authored andcommitted
[naga] Spell out members in adjust_expr.
1 parent d81cda3 commit 9c1ddb7

File tree

1 file changed

+46
-15
lines changed

1 file changed

+46
-15
lines changed

naga/src/back/pipeline_constants.rs

Lines changed: 46 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,8 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
324324
};
325325
match *expr {
326326
Expression::Compose {
327-
ref mut components, ..
327+
ref mut components,
328+
ty: _,
328329
} => {
329330
for c in components.iter_mut() {
330331
adjust(c);
@@ -337,13 +338,23 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
337338
adjust(base);
338339
adjust(index);
339340
}
340-
Expression::AccessIndex { ref mut base, .. } => {
341+
Expression::AccessIndex {
342+
ref mut base,
343+
index: _,
344+
} => {
341345
adjust(base);
342346
}
343-
Expression::Splat { ref mut value, .. } => {
347+
Expression::Splat {
348+
ref mut value,
349+
size: _,
350+
} => {
344351
adjust(value);
345352
}
346-
Expression::Swizzle { ref mut vector, .. } => {
353+
Expression::Swizzle {
354+
ref mut vector,
355+
size: _,
356+
pattern: _,
357+
} => {
347358
adjust(vector);
348359
}
349360
Expression::Load { ref mut pointer } => {
@@ -357,7 +368,7 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
357368
ref mut offset,
358369
ref mut level,
359370
ref mut depth_ref,
360-
..
371+
gather: _,
361372
} => {
362373
adjust(image);
363374
adjust(sampler);
@@ -416,16 +427,21 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
416427
adjust(e);
417428
}
418429
}
419-
_ => {}
430+
crate::ImageQuery::NumLevels
431+
| crate::ImageQuery::NumLayers
432+
| crate::ImageQuery::NumSamples => {}
420433
}
421434
}
422-
Expression::Unary { ref mut expr, .. } => {
435+
Expression::Unary {
436+
ref mut expr,
437+
op: _,
438+
} => {
423439
adjust(expr);
424440
}
425441
Expression::Binary {
426442
ref mut left,
427443
ref mut right,
428-
..
444+
op: _,
429445
} => {
430446
adjust(left);
431447
adjust(right);
@@ -439,11 +455,16 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
439455
adjust(accept);
440456
adjust(reject);
441457
}
442-
Expression::Derivative { ref mut expr, .. } => {
458+
Expression::Derivative {
459+
ref mut expr,
460+
axis: _,
461+
ctrl: _,
462+
} => {
443463
adjust(expr);
444464
}
445465
Expression::Relational {
446-
ref mut argument, ..
466+
ref mut argument,
467+
fun: _,
447468
} => {
448469
adjust(argument);
449470
}
@@ -452,7 +473,7 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
452473
ref mut arg1,
453474
ref mut arg2,
454475
ref mut arg3,
455-
..
476+
fun: _,
456477
} => {
457478
adjust(arg);
458479
if let Some(e) = arg1.as_mut() {
@@ -465,13 +486,20 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
465486
adjust(e);
466487
}
467488
}
468-
Expression::As { ref mut expr, .. } => {
489+
Expression::As {
490+
ref mut expr,
491+
kind: _,
492+
convert: _,
493+
} => {
469494
adjust(expr);
470495
}
471496
Expression::ArrayLength(ref mut expr) => {
472497
adjust(expr);
473498
}
474-
Expression::RayQueryGetIntersection { ref mut query, .. } => {
499+
Expression::RayQueryGetIntersection {
500+
ref mut query,
501+
committed: _,
502+
} => {
475503
adjust(query);
476504
}
477505
Expression::Literal(_)
@@ -483,8 +511,11 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
483511
| Expression::Constant(_)
484512
| Expression::Override(_)
485513
| Expression::ZeroValue(_)
486-
| Expression::AtomicResult { .. }
487-
| Expression::WorkGroupUniformLoadResult { .. } => {}
514+
| Expression::AtomicResult {
515+
ty: _,
516+
comparison: _,
517+
}
518+
| Expression::WorkGroupUniformLoadResult { ty: _ } => {}
488519
}
489520
}
490521

0 commit comments

Comments
 (0)