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] Don't output empty struct in entry point

Browse Source
This commit is contained in:
João Capucho
2021-06-03 19:33:20 +01:00
committed by Dzmitry Malyshau
parent ce88c9d537
commit db3dd63bdd
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/front/glsl/functions.rs
View File

@@ -599,19 +599,26 @@ impl Program<'_> {
components.push(load)
}
let ty = self.module.types.append(Type {
name: None,
inner: TypeInner::Struct {
top_level: false,
members,
span,
},
});
let (ty, value) = if !components.is_empty() {
let ty = self.module.types.append(Type {
name: None,
inner: TypeInner::Struct {
top_level: false,
members,
span,
},
});
let len = expressions.len();
let res = expressions.append(Expression::Compose { ty, components });
body.push(Statement::Emit(expressions.range_from(len)));
body.push(Statement::Return { value: Some(res) });
let len = expressions.len();
let res = expressions.append(Expression::Compose { ty, components });
body.push(Statement::Emit(expressions.range_from(len)));
(Some(ty), Some(res))
} else {
(None, None)
};
body.push(Statement::Return { value });
self.module.entry_points.push(EntryPoint {
name,
@@ -623,7 +630,7 @@ impl Program<'_> {
arguments,
expressions,
body,
result: Some(FunctionResult { ty, binding: None }),
result: ty.map(|ty| FunctionResult { ty, binding: None }),
..Default::default()
},
});