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

[glsl-in] Implicit convert initializers

Browse Source
This commit is contained in:
João Capucho
2021-06-06 14:26:19 +01:00
committed by Dzmitry Malyshau
parent a9dad25b0f
commit 2023b1a72c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/front/glsl/parser.rs
View File

@@ -527,8 +527,15 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> {
let init = self
.bump_if(TokenValue::Assign)
.map::<Result<_>, _>(|_| {
let (expr, init_meta) = self.parse_initializer(ty, ctx.ctx, ctx.body)?;
let (mut expr, init_meta) = self.parse_initializer(ty, ctx.ctx, ctx.body)?;
if let Some(kind) = self.program.module.types[ty].inner.scalar_kind() {
ctx.ctx
.implicit_conversion(self.program, &mut expr, init_meta, kind)?;
}
meta = meta.union(&init_meta);
Ok((expr, init_meta))
})
.transpose()?;
@@ -541,7 +548,7 @@ impl<'source, 'program, 'options> Parser<'source, 'program, 'options> {
let pointer = ctx.add_var(self.program, ty, name, maybe_constant, meta)?;
if let Some((value, _)) = init {
if let Some((value, _)) = init.filter(|_| maybe_constant.is_none()) {
ctx.flush_expressions();
ctx.body.push(Statement::Store { pointer, value });
}