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

[spv-in] Fix bitfieldExtract/Insert argument types (#1453)

Browse Source
This commit is contained in:
Connor Fitzgerald
2021-10-07 09:15:38 -04:00
committed by GitHub
parent 0e3fbc8166
commit 2e7d629aef
1 changed files with 83 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1854,6 +1854,9 @@ impl<I: Iterator<Item = u32>> Parser<I> {
Op::BitFieldInsert => { Op::BitFieldInsert => {
inst.expect(7)?; inst.expect(7)?;
let start = self.data_offset;
let span = self.span_from_with_op(start);
let result_type_id = self.next()?; let result_type_id = self.next()?;
let result_id = self.next()?; let result_id = self.next()?;
let base_id = self.next()?; let base_id = self.next()?;
@@ -1866,14 +1869,52 @@ impl<I: Iterator<Item = u32>> Parser<I> {
let insert_handle = get_expr_handle!(insert_id, insert_lexp); let insert_handle = get_expr_handle!(insert_id, insert_lexp);
let offset_lexp = self.lookup_expression.lookup(offset_id)?; let offset_lexp = self.lookup_expression.lookup(offset_id)?;
let offset_handle = get_expr_handle!(offset_id, offset_lexp); let offset_handle = get_expr_handle!(offset_id, offset_lexp);
let offset_lookup_ty = self.lookup_type.lookup(offset_lexp.type_id)?;
let count_lexp = self.lookup_expression.lookup(count_id)?; let count_lexp = self.lookup_expression.lookup(count_id)?;
let count_handle = get_expr_handle!(count_id, count_lexp); let count_handle = get_expr_handle!(count_id, count_lexp);
let count_lookup_ty = self.lookup_type.lookup(count_lexp.type_id)?;
let offset_kind = ctx.type_arena[offset_lookup_ty.handle]
.inner
.scalar_kind()
.unwrap();
let count_kind = ctx.type_arena[count_lookup_ty.handle]
.inner
.scalar_kind()
.unwrap();
let offset_cast_handle = if offset_kind != crate::ScalarKind::Uint {
ctx.expressions.append(
crate::Expression::As {
expr: offset_handle,
kind: crate::ScalarKind::Uint,
convert: None,
},
span,
)
} else {
offset_handle
};
let count_cast_handle = if count_kind != crate::ScalarKind::Uint {
ctx.expressions.append(
crate::Expression::As {
expr: count_handle,
kind: crate::ScalarKind::Uint,
convert: None,
},
span,
)
} else {
count_handle
};
let expr = crate::Expression::Math { let expr = crate::Expression::Math {
fun: crate::MathFunction::InsertBits, fun: crate::MathFunction::InsertBits,
arg: base_handle, arg: base_handle,
arg1: Some(insert_handle), arg1: Some(insert_handle),
arg2: Some(offset_handle), arg2: Some(offset_cast_handle),
arg3: Some(count_handle), arg3: Some(count_cast_handle),
}; };
self.lookup_expression.insert( self.lookup_expression.insert(
result_id, result_id,
@@ -1896,13 +1937,51 @@ impl<I: Iterator<Item = u32>> Parser<I> {
let base_handle = get_expr_handle!(base_id, base_lexp); let base_handle = get_expr_handle!(base_id, base_lexp);
let offset_lexp = self.lookup_expression.lookup(offset_id)?; let offset_lexp = self.lookup_expression.lookup(offset_id)?;
let offset_handle = get_expr_handle!(offset_id, offset_lexp); let offset_handle = get_expr_handle!(offset_id, offset_lexp);
let offset_lookup_ty = self.lookup_type.lookup(offset_lexp.type_id)?;
let count_lexp = self.lookup_expression.lookup(count_id)?; let count_lexp = self.lookup_expression.lookup(count_id)?;
let count_handle = get_expr_handle!(count_id, count_lexp); let count_handle = get_expr_handle!(count_id, count_lexp);
let count_lookup_ty = self.lookup_type.lookup(count_lexp.type_id)?;
let offset_kind = ctx.type_arena[offset_lookup_ty.handle]
.inner
.scalar_kind()
.unwrap();
let count_kind = ctx.type_arena[count_lookup_ty.handle]
.inner
.scalar_kind()
.unwrap();
let offset_cast_handle = if offset_kind != crate::ScalarKind::Uint {
ctx.expressions.append(
crate::Expression::As {
expr: offset_handle,
kind: crate::ScalarKind::Uint,
convert: None,
},
span,
)
} else {
offset_handle
};
let count_cast_handle = if count_kind != crate::ScalarKind::Uint {
ctx.expressions.append(
crate::Expression::As {
expr: count_handle,
kind: crate::ScalarKind::Uint,
convert: None,
},
span,
)
} else {
count_handle
};
let expr = crate::Expression::Math { let expr = crate::Expression::Math {
fun: crate::MathFunction::ExtractBits, fun: crate::MathFunction::ExtractBits,
arg: base_handle, arg: base_handle,
arg1: Some(offset_handle), arg1: Some(offset_cast_handle),
arg2: Some(count_handle), arg2: Some(count_cast_handle),
arg3: None, arg3: None,
}; };
self.lookup_expression.insert( self.lookup_expression.insert(