Skip to content

Commit 048acfe

Browse files
committed
Resolve semantic merge conflict with gfx-rs#7339
1 parent 8b8cf65 commit 048acfe

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • naga/src/front/wgsl/lower

naga/src/front/wgsl/lower/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,9 +661,9 @@ impl<'source, 'temp, 'out> ExpressionContext<'source, 'temp, 'out> {
661661
local_expression_kind_tracker: rctx.local_expression_kind_tracker,
662662
};
663663
let mut nested_ctx = ExpressionContext {
664+
enable_extensions: self.enable_extensions,
664665
expr_type: ExpressionContextType::Runtime(nested_rctx),
665666
ast_expressions: self.ast_expressions,
666-
types: self.types,
667667
globals: self.globals,
668668
module: self.module,
669669
const_typifier: self.const_typifier,

0 commit comments

Comments
 (0)