nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-22 06:45:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undo accidental subst->arg renames in builder/spirv_asm.

Browse Source
This commit is contained in:
Eduard-Mihai Burtescu 2023-11-21 10:36:39 +02:00
parent 9b587c1712
commit acaf74c060
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/rustc_codegen_spirv/src/builder/spirv_asm.rs
View File

@ -660,7 +660,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
/// `leftover_operands` is used for `IndexComposite` patterns, if any exist. /// `leftover_operands` is used for `IndexComposite` patterns, if any exist.
/// If the pattern isn't constraining enough to determine an unique type, /// If the pattern isn't constraining enough to determine an unique type,
/// `Err(Ambiguous)` is returned instead. /// `Err(Ambiguous)` is returned instead.
fn arg_ty_pat( fn subst_ty_pat(
cx: &CodegenCx<'_>, cx: &CodegenCx<'_>,
pat: &TyPat<'_>, pat: &TyPat<'_>,
ty_vars: &[Option<Word>], ty_vars: &[Option<Word>],
@ -673,23 +673,23 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
}, },
TyPat::Pointer(_, pat) => SpirvType::Pointer { TyPat::Pointer(_, pat) => SpirvType::Pointer {
pointee: arg_ty_pat(cx, pat, ty_vars, leftover_operands)?, pointee: subst_ty_pat(cx, pat, ty_vars, leftover_operands)?,
} }
.def(DUMMY_SP, cx), .def(DUMMY_SP, cx),
TyPat::Vector4(pat) => SpirvType::Vector { TyPat::Vector4(pat) => SpirvType::Vector {
element: arg_ty_pat(cx, pat, ty_vars, leftover_operands)?, element: subst_ty_pat(cx, pat, ty_vars, leftover_operands)?,
count: 4, count: 4,
} }
.def(DUMMY_SP, cx), .def(DUMMY_SP, cx),
TyPat::SampledImage(pat) => SpirvType::SampledImage { TyPat::SampledImage(pat) => SpirvType::SampledImage {
image_type: arg_ty_pat(cx, pat, ty_vars, leftover_operands)?, image_type: subst_ty_pat(cx, pat, ty_vars, leftover_operands)?,
} }
.def(DUMMY_SP, cx), .def(DUMMY_SP, cx),
TyPat::IndexComposite(pat) => { TyPat::IndexComposite(pat) => {
let mut ty =arg_ty_pat(cx, pat, ty_vars, leftover_operands)?; let mut ty = subst_ty_pat(cx, pat, ty_vars, leftover_operands)?;
for index in leftover_operands { for index in leftover_operands {
let index_to_usize = || match *index { let index_to_usize = || match *index {
// FIXME(eddyb) support more than just literals, // FIXME(eddyb) support more than just literals,
@ -780,7 +780,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
_ => return None, _ => return None,
} }
match arg_ty_pat( match subst_ty_pat(
self, self,
sig.output_type.unwrap(), sig.output_type.unwrap(),
&combined_ty_vars, &combined_ty_vars,