[naga] Spell out members in adjust_expr.

This commit is contained in:
Jim Blandy 2024-03-25 18:29:11 -07:00 committed by Teodor Tanasoaia
parent 8a2bc07f11
commit 906ed128de

View File

@ -324,7 +324,8 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
}; };
match *expr { match *expr {
Expression::Compose { Expression::Compose {
ref mut components, .. ref mut components,
ty: _,
} => { } => {
for c in components.iter_mut() { for c in components.iter_mut() {
adjust(c); adjust(c);
@ -337,13 +338,23 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
adjust(base); adjust(base);
adjust(index); adjust(index);
} }
Expression::AccessIndex { ref mut base, .. } => { Expression::AccessIndex {
ref mut base,
index: _,
} => {
adjust(base); adjust(base);
} }
Expression::Splat { ref mut value, .. } => { Expression::Splat {
ref mut value,
size: _,
} => {
adjust(value); adjust(value);
} }
Expression::Swizzle { ref mut vector, .. } => { Expression::Swizzle {
ref mut vector,
size: _,
pattern: _,
} => {
adjust(vector); adjust(vector);
} }
Expression::Load { ref mut pointer } => { Expression::Load { ref mut pointer } => {
@ -357,7 +368,7 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
ref mut offset, ref mut offset,
ref mut level, ref mut level,
ref mut depth_ref, ref mut depth_ref,
.. gather: _,
} => { } => {
adjust(image); adjust(image);
adjust(sampler); adjust(sampler);
@ -416,16 +427,21 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
adjust(e); adjust(e);
} }
} }
_ => {} crate::ImageQuery::NumLevels
| crate::ImageQuery::NumLayers
| crate::ImageQuery::NumSamples => {}
} }
} }
Expression::Unary { ref mut expr, .. } => { Expression::Unary {
ref mut expr,
op: _,
} => {
adjust(expr); adjust(expr);
} }
Expression::Binary { Expression::Binary {
ref mut left, ref mut left,
ref mut right, ref mut right,
.. op: _,
} => { } => {
adjust(left); adjust(left);
adjust(right); adjust(right);
@ -439,11 +455,16 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
adjust(accept); adjust(accept);
adjust(reject); adjust(reject);
} }
Expression::Derivative { ref mut expr, .. } => { Expression::Derivative {
ref mut expr,
axis: _,
ctrl: _,
} => {
adjust(expr); adjust(expr);
} }
Expression::Relational { Expression::Relational {
ref mut argument, .. ref mut argument,
fun: _,
} => { } => {
adjust(argument); adjust(argument);
} }
@ -452,7 +473,7 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
ref mut arg1, ref mut arg1,
ref mut arg2, ref mut arg2,
ref mut arg3, ref mut arg3,
.. fun: _,
} => { } => {
adjust(arg); adjust(arg);
if let Some(e) = arg1.as_mut() { if let Some(e) = arg1.as_mut() {
@ -465,13 +486,20 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
adjust(e); adjust(e);
} }
} }
Expression::As { ref mut expr, .. } => { Expression::As {
ref mut expr,
kind: _,
convert: _,
} => {
adjust(expr); adjust(expr);
} }
Expression::ArrayLength(ref mut expr) => { Expression::ArrayLength(ref mut expr) => {
adjust(expr); adjust(expr);
} }
Expression::RayQueryGetIntersection { ref mut query, .. } => { Expression::RayQueryGetIntersection {
ref mut query,
committed: _,
} => {
adjust(query); adjust(query);
} }
Expression::Literal(_) Expression::Literal(_)
@ -483,8 +511,11 @@ fn adjust_expr(new_pos: &[Handle<Expression>], expr: &mut Expression) {
| Expression::Constant(_) | Expression::Constant(_)
| Expression::Override(_) | Expression::Override(_)
| Expression::ZeroValue(_) | Expression::ZeroValue(_)
| Expression::AtomicResult { .. } | Expression::AtomicResult {
| Expression::WorkGroupUniformLoadResult { .. } => {} ty: _,
comparison: _,
}
| Expression::WorkGroupUniformLoadResult { ty: _ } => {}
} }
} }