From 801b29cf01df1404472c395b4f7db5b1df78a1fe Mon Sep 17 00:00:00 2001 From: sagudev <16504129+sagudev@users.noreply.github.com> Date: Sat, 8 Mar 2025 18:33:08 +0100 Subject: [PATCH] Do not add local const to named expr Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- naga/src/front/wgsl/lower/mod.rs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/naga/src/front/wgsl/lower/mod.rs b/naga/src/front/wgsl/lower/mod.rs index 1fa3ecc83f..af44242f11 100644 --- a/naga/src/front/wgsl/lower/mod.rs +++ b/naga/src/front/wgsl/lower/mod.rs @@ -1604,7 +1604,7 @@ impl<'source, 'temp> Lowerer<'source, 'temp> { c.ty.map(|ast| self.resolve_ast_type(ast, &mut ectx.as_const())) .transpose()?; - let (ty, init) = self.type_and_init( + let (_ty, init) = self.type_and_init( c.name, Some(c.init), explicit_ty, @@ -1616,13 +1616,6 @@ impl<'source, 'temp> Lowerer<'source, 'temp> { block.extend(emitter.finish(&ctx.function.expressions)); ctx.local_table .insert(c.handle, Declared::Const(Typed::Plain(init))); - // Only add constants of non-abstract types to the named expressions - // to prevent abstract types ending up in the IR. - let is_abstract = ctx.module.types[ty].inner.is_abstract(&ctx.module.types); - if !is_abstract { - ctx.named_expressions - .insert(init, (c.name.name.to_string(), c.name.span)); - } return Ok(()); } },