nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-04-16 05:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[naga wgsl-out] Stop using TypeContext::write_type_inner.

Browse Source 
In `naga:🔙:wgsl`, prefer `TypeContext::write_type_resolution`
over `write_type_inner`, since the former is actually what we need,
and the latter can be troublesome if asked to write a `struct` type.
This commit is contained in:
Jim Blandy 2025-04-09 11:43:45 -07:00 committed by Erich Gubler
parent dd60ce30e4
commit 7f08498069
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
naga/src/back/wgsl/writer.rs
View File

@ -481,7 +481,11 @@ impl<W: Write> Writer<W> {
Ok(())
}
fn write_type_inner(&mut self, module: &Module, inner: &TypeInner) -> BackendResult {
fn write_type_resolution(
&mut self,
module: &Module,
resolution: &proc::TypeResolution,
) -> BackendResult {
// This actually can't be factored out into a nice constructor method,
// because the borrow checker needs to be able to see that the borrows
// of `self.names` and `self.out` are disjoint.
@ -489,7 +493,7 @@ impl<W: Write> Writer<W> {
module,
names: &self.names,
};
type_context.write_type_inner(inner, &mut self.out)?;
type_context.write_type_resolution(resolution, &mut self.out)?;
Ok(())
}
@ -1031,16 +1035,8 @@ impl<W: Write> Writer<W> {
write!(self.out, "let {name}")?;
if self.flags.contains(WriterFlags::EXPLICIT_TYPES) {
write!(self.out, ": ")?;
let ty = &func_ctx.info[handle].ty;
// Write variable type
match *ty {
proc::TypeResolution::Handle(handle) => {
self.write_type(module, handle)?;
}
proc::TypeResolution::Value(ref inner) => {
self.write_type_inner(module, inner)?;
}
}
self.write_type_resolution(module, &func_ctx.info[handle].ty)?;
}
write!(self.out, " = ")?;