nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-12-01 03:03:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[spirv] register function parameters, handle return values

Browse Source
This commit is contained in:
Dzmitry Malyshau 2020-08-26 23:58:15 -04:00 committed by Dzmitry Malyshau
parent cf6002be01
commit 35e14378b3
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/front/spv/function.rs
View File

@ -88,8 +88,15 @@ pub fn parse_function<I: Iterator<Item = u32>>(
wc: 3,
} => {
let type_id = parser.next()?;
let _id = parser.next()?;
let id = parser.next()?;
let handle = fun
.expressions
.append(crate::Expression::FunctionParameter(i as u32));
parser
.lookup_expression
.insert(id, LookupExpression { type_id, handle });
//Note: we redo the lookup in order to work around `parser` borrowing
if type_id
!= parser
.lookup_function_type

17
src/front/spv/mod.rs
View File

@ -480,6 +480,9 @@ impl<I: Iterator<Item = u32>> Parser<I> {
.future_decor
.remove(&result_id)
.and_then(|decor| decor.name);
if let Some(ref name) = name {
log::debug!("\t\t\tid={} name={}", result_id, name);
}
let var_handle = local_arena.append(crate::LocalVariable {
name,
ty: self.lookup_type.lookup(result_type_id)?.handle,
@ -1120,6 +1123,14 @@ impl<I: Iterator<Item = u32>> Parser<I> {
inst.expect(1)?;
break Terminator::Return { value: None };
}
Op::ReturnValue => {
inst.expect(2)?;
let value_id = self.next()?;
let value_expr = self.lookup_expression.lookup(value_id)?;
break Terminator::Return {
value: Some(value_expr.handle),
};
}
Op::Branch => {
inst.expect(2)?;
let target_id = self.next()?;
@ -1215,21 +1226,23 @@ impl<I: Iterator<Item = u32>> Parser<I> {
}
// register global variables
for (&id, var) in self.lookup_variable.iter() {
let handle = expressions.append(crate::Expression::GlobalVariable(var.handle));
self.lookup_expression.insert(
id,
LookupExpression {
type_id: var.type_id,
handle: expressions.append(crate::Expression::GlobalVariable(var.handle)),
handle,
},
);
}
// register constants
for (&id, con) in self.lookup_constant.iter() {
let handle = expressions.append(crate::Expression::Constant(con.handle));
self.lookup_expression.insert(
id,
LookupExpression {
type_id: con.type_id,
handle: expressions.append(crate::Expression::Constant(con.handle)),
handle,
},
);
}