From 3d24e50b63557fdb91fb8a85c9bea3eee9447e29 Mon Sep 17 00:00:00 2001 From: teoxoy <28601907+teoxoy@users.noreply.github.com> Date: Tue, 10 Oct 2023 12:20:17 +0200 Subject: [PATCH] fixup! [wgsl-in] eagerly evaluate const-expressions --- src/valid/expression.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/valid/expression.rs b/src/valid/expression.rs index 064f700047..95225a3926 100644 --- a/src/valid/expression.rs +++ b/src/valid/expression.rs @@ -198,12 +198,10 @@ impl super::Validator { components.iter().map(|&handle| mod_info[handle].clone()), )?; } - E::Splat { value, .. } => { - match *mod_info.const_expression_types[value.index()].inner_with(gctx.types) { - crate::TypeInner::Scalar { .. } => {} - _ => return Err(super::ConstExpressionError::InvalidSplatType(value)), - } - } + E::Splat { value, .. } => match *mod_info[value].inner_with(gctx.types) { + crate::TypeInner::Scalar { .. } => {} + _ => return Err(super::ConstExpressionError::InvalidSplatType(value)), + }, _ => return Err(super::ConstExpressionError::NonConst), }