github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

[wgsl-in] Abstract out ExpressionContext::as_const_evaluator.

Browse Source
This commit is contained in:
Jim Blandy
2023-10-18 17:56:49 -07:00
committed by Teodor Tanasoaia
parent 334f745366
commit af26d77ce4
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/front/wgsl/lower/mod.rs
View File

@@ -346,31 +346,36 @@ impl<'source, 'temp, 'out> ExpressionContext<'source, 'temp, 'out> {
}
}
fn as_const_evaluator(&mut self) -> ConstantEvaluator {
match self.expr_type {
ExpressionContextType::Runtime(ref mut rctx) => ConstantEvaluator::for_wgsl_function(
self.module,
rctx.naga_expressions,
rctx.expression_constness,
rctx.emitter,
rctx.block,
),
ExpressionContextType::Constant => ConstantEvaluator::for_wgsl_module(self.module),
}
}
fn append_expression(
&mut self,
expr: crate::Expression,
span: Span,
) -> Result<Handle<crate::Expression>, Error<'source>> {
match self.expr_type {
ExpressionContextType::Runtime(ref mut rctx) => {
let mut eval = ConstantEvaluator::for_wgsl_function(
self.module,
rctx.naga_expressions,
rctx.expression_constness,
rctx.emitter,
rctx.block,
);
let mut eval = self.as_const_evaluator();
match eval.try_eval_and_append(&expr, span) {
Ok(expr) => Ok(expr),
match eval.try_eval_and_append(&expr, span) {
Ok(expr) => Ok(expr),
Err(_) => Ok(rctx.naga_expressions.append(expr, span)),
// `expr` is not a constant expression. This is fine as
// long as we're not building `Module::const_expressions`.
Err(err) => match self.expr_type {
ExpressionContextType::Runtime(ref mut rctx) => {
Ok(rctx.naga_expressions.append(expr, span))
}
}
ExpressionContextType::Constant => {
let mut eval = ConstantEvaluator::for_wgsl_module(self.module);
eval.try_eval_and_append(&expr, span)
.map_err(|e| Error::ConstantEvaluatorError(e, span))
}
ExpressionContextType::Constant => Err(Error::ConstantEvaluatorError(err, span)),
},
}
}